From 2f6d8ee94e1de473cf963885e4ba77b284ac01aa Mon Sep 17 00:00:00 2001 From: Feng Yu Date: Sun, 19 Jun 2022 11:00:16 +0800 Subject: [PATCH 1/6] build: update main branch name in GH workflow --- .github/workflows/build-tarball.yml | 1 - .github/workflows/build-windows.yml | 1 - .github/workflows/coverage-linux.yml | 3 ++- .github/workflows/coverage-windows.yml | 3 ++- .github/workflows/doc.yml | 1 - .github/workflows/linters.yml | 3 +-- .github/workflows/notify-force-push.yml | 1 - .github/workflows/test-asan.yml | 1 - .github/workflows/test-internet.yml | 1 - .github/workflows/test-linux.yml | 1 - .github/workflows/test-macos.yml | 1 - 11 files changed, 5 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build-tarball.yml b/.github/workflows/build-tarball.yml index 8c13541fd37d..52e3ac97c682 100644 --- a/.github/workflows/build-tarball.yml +++ b/.github/workflows/build-tarball.yml @@ -12,7 +12,6 @@ on: - '!.github/workflows/build-tarball.yml' push: branches: - - master - main - v[0-9]+.x-staging - v[0-9]+.x diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml index 5ab5f98739f5..c85c9976dfd3 100644 --- a/.github/workflows/build-windows.yml +++ b/.github/workflows/build-windows.yml @@ -9,7 +9,6 @@ on: types: [opened, synchronize, reopened, ready_for_review] push: branches: - - master - main - canary - v[0-9]+.x-staging diff --git a/.github/workflows/coverage-linux.yml b/.github/workflows/coverage-linux.yml index 77bad80cc269..5e8115a9245d 100644 --- a/.github/workflows/coverage-linux.yml +++ b/.github/workflows/coverage-linux.yml @@ -11,7 +11,8 @@ on: - .github/** - '!.github/workflows/coverage-linux.yml' push: - branches: [master, main] + branches: + - main paths-ignore: - '**.md' - benchmark/** diff --git a/.github/workflows/coverage-windows.yml b/.github/workflows/coverage-windows.yml index 29e7ac689a20..287872d79f3d 100644 --- a/.github/workflows/coverage-windows.yml +++ b/.github/workflows/coverage-windows.yml @@ -12,7 +12,8 @@ on: - .github/** - '!.github/workflows/coverage-windows.yml' push: - branches: [master, main] + branches: + - main paths-ignore: - '**.md' - benchmark/** diff --git a/.github/workflows/doc.yml b/.github/workflows/doc.yml index 1151c4296780..474a8dd7eac4 100644 --- a/.github/workflows/doc.yml +++ b/.github/workflows/doc.yml @@ -5,7 +5,6 @@ on: types: [opened, synchronize, reopened, ready_for_review] push: branches: - - master - main - v[0-9]+.x-staging - v[0-9]+.x diff --git a/.github/workflows/linters.yml b/.github/workflows/linters.yml index 0fa577025211..a36446403fa3 100644 --- a/.github/workflows/linters.yml +++ b/.github/workflows/linters.yml @@ -5,7 +5,6 @@ on: types: [opened, synchronize, reopened, ready_for_review] push: branches: - - master - main - v[0-9]+.x-staging - v[0-9]+.x @@ -50,7 +49,7 @@ jobs: - name: Lint C/C++ files run: make lint-cpp format-cpp: - if: ${{ github.event.pull_request.draft == false && github.base_ref == 'master' }} + if: ${{ github.event.pull_request.draft == false && github.base_ref == 'main' }} runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/notify-force-push.yml b/.github/workflows/notify-force-push.yml index 4f43a7d71501..32876584edb3 100644 --- a/.github/workflows/notify-force-push.yml +++ b/.github/workflows/notify-force-push.yml @@ -1,7 +1,6 @@ on: push: branches: - - master - main name: Notify on Force Push diff --git a/.github/workflows/test-asan.yml b/.github/workflows/test-asan.yml index 87cf9edf672d..b345eded2017 100644 --- a/.github/workflows/test-asan.yml +++ b/.github/workflows/test-asan.yml @@ -12,7 +12,6 @@ on: - '!.github/workflows/test-asan.yml' push: branches: - - master - main - canary - v[0-9]+.x-staging diff --git a/.github/workflows/test-internet.yml b/.github/workflows/test-internet.yml index 8325845963ec..75f508bfe012 100644 --- a/.github/workflows/test-internet.yml +++ b/.github/workflows/test-internet.yml @@ -10,7 +10,6 @@ on: paths: [test/internet/**] push: branches: - - master - main - canary - v[0-9]+.x-staging diff --git a/.github/workflows/test-linux.yml b/.github/workflows/test-linux.yml index 7d6f4303e925..b2fa9e0a0cbb 100644 --- a/.github/workflows/test-linux.yml +++ b/.github/workflows/test-linux.yml @@ -9,7 +9,6 @@ on: types: [opened, synchronize, reopened, ready_for_review] push: branches: - - master - main - canary - v[0-9]+.x-staging diff --git a/.github/workflows/test-macos.yml b/.github/workflows/test-macos.yml index 0c76a44bae96..f342dbfa0f13 100644 --- a/.github/workflows/test-macos.yml +++ b/.github/workflows/test-macos.yml @@ -12,7 +12,6 @@ on: - '!.github/workflows/test-macos.yml' push: branches: - - master - main - canary - v[0-9]+.x-staging From 5b036a8610672838e2187816e3a0ebb5aa736a01 Mon Sep 17 00:00:00 2001 From: Feng Yu Date: Sun, 19 Jun 2022 15:45:14 +0800 Subject: [PATCH 2/6] squash: use $default-branch macro rather than hardcoded main --- .github/workflows/build-tarball.yml | 2 +- .github/workflows/build-windows.yml | 2 +- .github/workflows/coverage-linux.yml | 2 +- .github/workflows/coverage-windows.yml | 2 +- .github/workflows/doc.yml | 2 +- .github/workflows/linters.yml | 2 +- .github/workflows/notify-force-push.yml | 2 +- .github/workflows/test-asan.yml | 2 +- .github/workflows/test-internet.yml | 2 +- .github/workflows/test-linux.yml | 2 +- .github/workflows/test-macos.yml | 2 +- tools/gyp/.github/workflows/release-please.yml | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build-tarball.yml b/.github/workflows/build-tarball.yml index 52e3ac97c682..e0f7277acbbe 100644 --- a/.github/workflows/build-tarball.yml +++ b/.github/workflows/build-tarball.yml @@ -12,7 +12,7 @@ on: - '!.github/workflows/build-tarball.yml' push: branches: - - main + - $default-branch - v[0-9]+.x-staging - v[0-9]+.x paths-ignore: diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml index c85c9976dfd3..8f98773336ed 100644 --- a/.github/workflows/build-windows.yml +++ b/.github/workflows/build-windows.yml @@ -9,7 +9,7 @@ on: types: [opened, synchronize, reopened, ready_for_review] push: branches: - - main + - $default-branch - canary - v[0-9]+.x-staging - v[0-9]+.x diff --git a/.github/workflows/coverage-linux.yml b/.github/workflows/coverage-linux.yml index 5e8115a9245d..9ffc4dbb9bf7 100644 --- a/.github/workflows/coverage-linux.yml +++ b/.github/workflows/coverage-linux.yml @@ -12,7 +12,7 @@ on: - '!.github/workflows/coverage-linux.yml' push: branches: - - main + - $default-branch paths-ignore: - '**.md' - benchmark/** diff --git a/.github/workflows/coverage-windows.yml b/.github/workflows/coverage-windows.yml index 287872d79f3d..9fbb33a747c8 100644 --- a/.github/workflows/coverage-windows.yml +++ b/.github/workflows/coverage-windows.yml @@ -13,7 +13,7 @@ on: - '!.github/workflows/coverage-windows.yml' push: branches: - - main + - $default-branch paths-ignore: - '**.md' - benchmark/** diff --git a/.github/workflows/doc.yml b/.github/workflows/doc.yml index 474a8dd7eac4..565c9004af68 100644 --- a/.github/workflows/doc.yml +++ b/.github/workflows/doc.yml @@ -5,7 +5,7 @@ on: types: [opened, synchronize, reopened, ready_for_review] push: branches: - - main + - $default-branch - v[0-9]+.x-staging - v[0-9]+.x diff --git a/.github/workflows/linters.yml b/.github/workflows/linters.yml index a36446403fa3..1329d0e54169 100644 --- a/.github/workflows/linters.yml +++ b/.github/workflows/linters.yml @@ -5,7 +5,7 @@ on: types: [opened, synchronize, reopened, ready_for_review] push: branches: - - main + - $default-branch - v[0-9]+.x-staging - v[0-9]+.x diff --git a/.github/workflows/notify-force-push.yml b/.github/workflows/notify-force-push.yml index 32876584edb3..d20d901adfba 100644 --- a/.github/workflows/notify-force-push.yml +++ b/.github/workflows/notify-force-push.yml @@ -1,7 +1,7 @@ on: push: branches: - - main + - $default-branch name: Notify on Force Push jobs: diff --git a/.github/workflows/test-asan.yml b/.github/workflows/test-asan.yml index b345eded2017..4b81310185ee 100644 --- a/.github/workflows/test-asan.yml +++ b/.github/workflows/test-asan.yml @@ -12,7 +12,7 @@ on: - '!.github/workflows/test-asan.yml' push: branches: - - main + - $default-branch - canary - v[0-9]+.x-staging - v[0-9]+.x diff --git a/.github/workflows/test-internet.yml b/.github/workflows/test-internet.yml index 75f508bfe012..d9618045c9b5 100644 --- a/.github/workflows/test-internet.yml +++ b/.github/workflows/test-internet.yml @@ -10,7 +10,7 @@ on: paths: [test/internet/**] push: branches: - - main + - $default-branch - canary - v[0-9]+.x-staging - v[0-9]+.x diff --git a/.github/workflows/test-linux.yml b/.github/workflows/test-linux.yml index b2fa9e0a0cbb..f24902e0b32d 100644 --- a/.github/workflows/test-linux.yml +++ b/.github/workflows/test-linux.yml @@ -9,7 +9,7 @@ on: types: [opened, synchronize, reopened, ready_for_review] push: branches: - - main + - $default-branch - canary - v[0-9]+.x-staging - v[0-9]+.x diff --git a/.github/workflows/test-macos.yml b/.github/workflows/test-macos.yml index f342dbfa0f13..e3ef875c7405 100644 --- a/.github/workflows/test-macos.yml +++ b/.github/workflows/test-macos.yml @@ -12,7 +12,7 @@ on: - '!.github/workflows/test-macos.yml' push: branches: - - main + - $default-branch - canary - v[0-9]+.x-staging - v[0-9]+.x diff --git a/tools/gyp/.github/workflows/release-please.yml b/tools/gyp/.github/workflows/release-please.yml index 288afdb3b32e..cfc570cc56b2 100644 --- a/tools/gyp/.github/workflows/release-please.yml +++ b/tools/gyp/.github/workflows/release-please.yml @@ -1,7 +1,7 @@ on: push: branches: - - main + - $default-branch name: release-please jobs: From afc34f344ba7552681c1e11c41b7ba44a911462f Mon Sep 17 00:00:00 2001 From: Feng Yu Date: Sun, 19 Jun 2022 16:04:55 +0800 Subject: [PATCH 3/6] Revert "squash: use $default-branch macro rather than hardcoded main" This reverts commit 5b036a8610672838e2187816e3a0ebb5aa736a01. --- .github/workflows/build-tarball.yml | 2 +- .github/workflows/build-windows.yml | 2 +- .github/workflows/coverage-linux.yml | 2 +- .github/workflows/coverage-windows.yml | 2 +- .github/workflows/doc.yml | 2 +- .github/workflows/linters.yml | 2 +- .github/workflows/notify-force-push.yml | 2 +- .github/workflows/test-asan.yml | 2 +- .github/workflows/test-internet.yml | 2 +- .github/workflows/test-linux.yml | 2 +- .github/workflows/test-macos.yml | 2 +- tools/gyp/.github/workflows/release-please.yml | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build-tarball.yml b/.github/workflows/build-tarball.yml index e0f7277acbbe..52e3ac97c682 100644 --- a/.github/workflows/build-tarball.yml +++ b/.github/workflows/build-tarball.yml @@ -12,7 +12,7 @@ on: - '!.github/workflows/build-tarball.yml' push: branches: - - $default-branch + - main - v[0-9]+.x-staging - v[0-9]+.x paths-ignore: diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml index 8f98773336ed..c85c9976dfd3 100644 --- a/.github/workflows/build-windows.yml +++ b/.github/workflows/build-windows.yml @@ -9,7 +9,7 @@ on: types: [opened, synchronize, reopened, ready_for_review] push: branches: - - $default-branch + - main - canary - v[0-9]+.x-staging - v[0-9]+.x diff --git a/.github/workflows/coverage-linux.yml b/.github/workflows/coverage-linux.yml index 9ffc4dbb9bf7..5e8115a9245d 100644 --- a/.github/workflows/coverage-linux.yml +++ b/.github/workflows/coverage-linux.yml @@ -12,7 +12,7 @@ on: - '!.github/workflows/coverage-linux.yml' push: branches: - - $default-branch + - main paths-ignore: - '**.md' - benchmark/** diff --git a/.github/workflows/coverage-windows.yml b/.github/workflows/coverage-windows.yml index 9fbb33a747c8..287872d79f3d 100644 --- a/.github/workflows/coverage-windows.yml +++ b/.github/workflows/coverage-windows.yml @@ -13,7 +13,7 @@ on: - '!.github/workflows/coverage-windows.yml' push: branches: - - $default-branch + - main paths-ignore: - '**.md' - benchmark/** diff --git a/.github/workflows/doc.yml b/.github/workflows/doc.yml index 565c9004af68..474a8dd7eac4 100644 --- a/.github/workflows/doc.yml +++ b/.github/workflows/doc.yml @@ -5,7 +5,7 @@ on: types: [opened, synchronize, reopened, ready_for_review] push: branches: - - $default-branch + - main - v[0-9]+.x-staging - v[0-9]+.x diff --git a/.github/workflows/linters.yml b/.github/workflows/linters.yml index 1329d0e54169..a36446403fa3 100644 --- a/.github/workflows/linters.yml +++ b/.github/workflows/linters.yml @@ -5,7 +5,7 @@ on: types: [opened, synchronize, reopened, ready_for_review] push: branches: - - $default-branch + - main - v[0-9]+.x-staging - v[0-9]+.x diff --git a/.github/workflows/notify-force-push.yml b/.github/workflows/notify-force-push.yml index d20d901adfba..32876584edb3 100644 --- a/.github/workflows/notify-force-push.yml +++ b/.github/workflows/notify-force-push.yml @@ -1,7 +1,7 @@ on: push: branches: - - $default-branch + - main name: Notify on Force Push jobs: diff --git a/.github/workflows/test-asan.yml b/.github/workflows/test-asan.yml index 4b81310185ee..b345eded2017 100644 --- a/.github/workflows/test-asan.yml +++ b/.github/workflows/test-asan.yml @@ -12,7 +12,7 @@ on: - '!.github/workflows/test-asan.yml' push: branches: - - $default-branch + - main - canary - v[0-9]+.x-staging - v[0-9]+.x diff --git a/.github/workflows/test-internet.yml b/.github/workflows/test-internet.yml index d9618045c9b5..75f508bfe012 100644 --- a/.github/workflows/test-internet.yml +++ b/.github/workflows/test-internet.yml @@ -10,7 +10,7 @@ on: paths: [test/internet/**] push: branches: - - $default-branch + - main - canary - v[0-9]+.x-staging - v[0-9]+.x diff --git a/.github/workflows/test-linux.yml b/.github/workflows/test-linux.yml index f24902e0b32d..b2fa9e0a0cbb 100644 --- a/.github/workflows/test-linux.yml +++ b/.github/workflows/test-linux.yml @@ -9,7 +9,7 @@ on: types: [opened, synchronize, reopened, ready_for_review] push: branches: - - $default-branch + - main - canary - v[0-9]+.x-staging - v[0-9]+.x diff --git a/.github/workflows/test-macos.yml b/.github/workflows/test-macos.yml index e3ef875c7405..f342dbfa0f13 100644 --- a/.github/workflows/test-macos.yml +++ b/.github/workflows/test-macos.yml @@ -12,7 +12,7 @@ on: - '!.github/workflows/test-macos.yml' push: branches: - - $default-branch + - main - canary - v[0-9]+.x-staging - v[0-9]+.x diff --git a/tools/gyp/.github/workflows/release-please.yml b/tools/gyp/.github/workflows/release-please.yml index cfc570cc56b2..288afdb3b32e 100644 --- a/tools/gyp/.github/workflows/release-please.yml +++ b/tools/gyp/.github/workflows/release-please.yml @@ -1,7 +1,7 @@ on: push: branches: - - $default-branch + - main name: release-please jobs: From 0d21cf6546a13ea4b0d83f6f879d5f822ced2c04 Mon Sep 17 00:00:00 2001 From: Feng Yu Date: Sun, 19 Jun 2022 16:08:31 +0800 Subject: [PATCH 4/6] Update .github/workflows/linters.yml Co-authored-by: Antoine du Hamel --- .github/workflows/linters.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/linters.yml b/.github/workflows/linters.yml index a36446403fa3..3f9b52be4605 100644 --- a/.github/workflows/linters.yml +++ b/.github/workflows/linters.yml @@ -49,7 +49,7 @@ jobs: - name: Lint C/C++ files run: make lint-cpp format-cpp: - if: ${{ github.event.pull_request.draft == false && github.base_ref == 'main' }} + if: ${{ github.event.pull_request.draft == false && github.event.pull_request.base.ref == github.event.pull_request.base.repo.default_branch }} runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 From 63586394cd47c338180472f2060824a0232ca3db Mon Sep 17 00:00:00 2001 From: Feng Yu Date: Sun, 19 Jun 2022 16:51:11 +0800 Subject: [PATCH 5/6] Update .github/workflows/linters.yml Co-authored-by: Antoine du Hamel --- .github/workflows/linters.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/linters.yml b/.github/workflows/linters.yml index 3f9b52be4605..2ab673b0dda5 100644 --- a/.github/workflows/linters.yml +++ b/.github/workflows/linters.yml @@ -49,7 +49,7 @@ jobs: - name: Lint C/C++ files run: make lint-cpp format-cpp: - if: ${{ github.event.pull_request.draft == false && github.event.pull_request.base.ref == github.event.pull_request.base.repo.default_branch }} + if: ${{ github.event.pull_request && github.event.pull_request.draft == false && github.base_ref == github.repository.default_branch }} runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 From 4f3386a0d997efce094b6b258c25ba05647d6f02 Mon Sep 17 00:00:00 2001 From: Feng Yu Date: Sun, 19 Jun 2022 22:50:41 +0800 Subject: [PATCH 6/6] fixup! build: update main branch name in GH workflow --- .github/workflows/linters.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/linters.yml b/.github/workflows/linters.yml index 2ab673b0dda5..c9873d188a8e 100644 --- a/.github/workflows/linters.yml +++ b/.github/workflows/linters.yml @@ -49,7 +49,7 @@ jobs: - name: Lint C/C++ files run: make lint-cpp format-cpp: - if: ${{ github.event.pull_request && github.event.pull_request.draft == false && github.base_ref == github.repository.default_branch }} + if: ${{ github.event.pull_request && github.event.pull_request.draft == false && github.base_ref == github.event.repository.default_branch }} runs-on: ubuntu-latest steps: - uses: actions/checkout@v3