Commit 919c5ee
build: update main branch name in GH workflow
PR-URL: #43481
Refs: #33864
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>
Reviewed-By: Darshan Sen <raisinten@gmail.com>
Reviewed-By: Juan José Arboleda <soyjuanarbol@gmail.com>
Reviewed-By: Tierney Cyren <hello@bnb.im>1 parent 9940dc3 commit 919c5ee
11 files changed
Lines changed: 5 additions & 12 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -12,7 +12,6 @@ on: | |||
| 12 | 12 | - '!.github/workflows/build-tarball.yml' | |
| 13 | 13 | push: | |
| 14 | 14 | branches: | |
| 15 | - - master | ||
| 16 | 15 | - main | |
| 17 | 16 | - v[0-9]+.x-staging | |
| 18 | 17 | - v[0-9]+.x | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -9,7 +9,6 @@ on: | |||
| 9 | 9 | types: [opened, synchronize, reopened, ready_for_review] | |
| 10 | 10 | push: | |
| 11 | 11 | branches: | |
| 12 | - - master | ||
| 13 | 12 | - main | |
| 14 | 13 | - canary | |
| 15 | 14 | - v[0-9]+.x-staging | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -11,7 +11,8 @@ on: | |||
| 11 | 11 | - .github/** | |
| 12 | 12 | - '!.github/workflows/coverage-linux.yml' | |
| 13 | 13 | push: | |
| 14 | - branches: [master, main] | ||
| 14 | + branches: | ||
| 15 | + - main | ||
| 15 | 16 | paths-ignore: | |
| 16 | 17 | - '**.md' | |
| 17 | 18 | - benchmark/** | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -12,7 +12,8 @@ on: | |||
| 12 | 12 | - .github/** | |
| 13 | 13 | - '!.github/workflows/coverage-windows.yml' | |
| 14 | 14 | push: | |
| 15 | - branches: [master, main] | ||
| 15 | + branches: | ||
| 16 | + - main | ||
| 16 | 17 | paths-ignore: | |
| 17 | 18 | - '**.md' | |
| 18 | 19 | - benchmark/** | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -5,7 +5,6 @@ on: | |||
| 5 | 5 | types: [opened, synchronize, reopened, ready_for_review] | |
| 6 | 6 | push: | |
| 7 | 7 | branches: | |
| 8 | - - master | ||
| 9 | 8 | - main | |
| 10 | 9 | - v[0-9]+.x-staging | |
| 11 | 10 | - v[0-9]+.x | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -5,7 +5,6 @@ on: | |||
| 5 | 5 | types: [opened, synchronize, reopened, ready_for_review] | |
| 6 | 6 | push: | |
| 7 | 7 | branches: | |
| 8 | - - master | ||
| 9 | 8 | - main | |
| 10 | 9 | - v[0-9]+.x-staging | |
| 11 | 10 | - v[0-9]+.x | |
@@ -50,7 +49,7 @@ jobs: | |||
| 50 | 49 | - name: Lint C/C++ files | |
| 51 | 50 | run: make lint-cpp | |
| 52 | 51 | format-cpp: | |
| 53 | - if: ${{ github.event.pull_request.draft == false && github.base_ref == 'master' }} | ||
| 52 | + if: ${{ github.event.pull_request && github.event.pull_request.draft == false && github.base_ref == github.event.repository.default_branch }} | ||
| 54 | 53 | runs-on: ubuntu-latest | |
| 55 | 54 | steps: | |
| 56 | 55 | - uses: actions/checkout@v3 | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1,7 +1,6 @@ | |||
| 1 | 1 | on: | |
| 2 | 2 | push: | |
| 3 | 3 | branches: | |
| 4 | - - master | ||
| 5 | 4 | - main | |
| 6 | 5 | ||
| 7 | 6 | name: Notify on Force Push | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -12,7 +12,6 @@ on: | |||
| 12 | 12 | - '!.github/workflows/test-asan.yml' | |
| 13 | 13 | push: | |
| 14 | 14 | branches: | |
| 15 | - - master | ||
| 16 | 15 | - main | |
| 17 | 16 | - canary | |
| 18 | 17 | - v[0-9]+.x-staging | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -10,7 +10,6 @@ on: | |||
| 10 | 10 | paths: [test/internet/**] | |
| 11 | 11 | push: | |
| 12 | 12 | branches: | |
| 13 | - - master | ||
| 14 | 13 | - main | |
| 15 | 14 | - canary | |
| 16 | 15 | - v[0-9]+.x-staging | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -9,7 +9,6 @@ on: | |||
| 9 | 9 | types: [opened, synchronize, reopened, ready_for_review] | |
| 10 | 10 | push: | |
| 11 | 11 | branches: | |
| 12 | - - master | ||
| 13 | 12 | - main | |
| 14 | 13 | - canary | |
| 15 | 14 | - v[0-9]+.x-staging | |
0 commit comments