From 919c5ee5c253180c4ab02deb93085c99760aeedb Mon Sep 17 00:00:00 2001 From: Feng Yu Date: Thu, 23 Jun 2022 12:57:51 +0800 Subject: [PATCH] build: update main branch name in GH workflow MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit PR-URL: https://github.com/nodejs/node/pull/43481 Refs: https://github.com/nodejs/node/issues/33864 Reviewed-By: Luigi Pinca Reviewed-By: Antoine du Hamel Reviewed-By: Darshan Sen Reviewed-By: Juan José Arboleda Reviewed-By: Tierney Cyren --- .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 8c13541fd37d14..52e3ac97c68297 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 5ab5f98739f579..c85c9976dfd380 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 77bad80cc269d5..5e8115a9245ded 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 29e7ac689a2043..287872d79f3dee 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 1151c42967807a..474a8dd7eac45e 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 0fa577025211e9..c9873d188a8e14 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 && github.event.pull_request.draft == false && github.base_ref == github.event.repository.default_branch }} 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 4f43a7d715013c..32876584edb3c3 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 87cf9edf672d47..b345eded201755 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 8325845963ecf9..75f508bfe01258 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 7d6f4303e9256e..b2fa9e0a0cbbb6 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 0c76a44bae9695..f342dbfa0f130e 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