From 2ded29384e12bea6d2630465815478de640546a5 Mon Sep 17 00:00:00 2001 From: Mestery Date: Fri, 26 Nov 2021 22:17:48 +0100 Subject: [PATCH] build: improve consistency between workflows --- .github/workflows/authors.yml | 2 +- .github/workflows/auto-start-ci.yml | 12 ++++++------ .github/workflows/build-tarball.yml | 5 +---- .github/workflows/build-windows.yml | 6 +++--- .github/workflows/comment-labeled.yml | 8 ++++---- .github/workflows/commit-lint.yml | 2 +- .github/workflows/coverage-linux.yml | 6 ++---- .github/workflows/coverage-windows.yml | 6 ++---- .github/workflows/{misc.yml => doc.yml} | 2 +- .github/workflows/license-builder.yml | 2 +- .github/workflows/linters.yml | 4 ++-- .github/workflows/notify-force-push.yml | 2 +- .github/workflows/test-asan.yml | 2 +- .github/workflows/test-internet.yml | 8 +++----- .github/workflows/test-linux.yml | 6 +++--- .github/workflows/test-macos.yml | 2 +- .github/workflows/tools.yml | 4 ++-- 17 files changed, 35 insertions(+), 44 deletions(-) rename .github/workflows/{misc.yml => doc.yml} (94%) diff --git a/.github/workflows/authors.yml b/.github/workflows/authors.yml index 0a14c94f1d7e74..0df61e45298201 100644 --- a/.github/workflows/authors.yml +++ b/.github/workflows/authors.yml @@ -1,4 +1,4 @@ -name: "authors update" +name: Authors update on: schedule: # Run once a week at 00:05 AM UTC on Sunday. diff --git a/.github/workflows/auto-start-ci.yml b/.github/workflows/auto-start-ci.yml index 632fdc0a970ceb..e3399ec3cabb32 100644 --- a/.github/workflows/auto-start-ci.yml +++ b/.github/workflows/auto-start-ci.yml @@ -12,7 +12,7 @@ env: NODE_VERSION: lts/* jobs: - get_prs_for_ci: + get-prs-for-ci: if: github.repository == 'nodejs/node' runs-on: ubuntu-latest outputs: @@ -29,20 +29,20 @@ jobs: --limit 100 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - startCI: - needs: get_prs_for_ci - if: needs.get_prs_for_ci.outputs.numbers != '' + start-ci: + needs: get-prs-for-ci + if: needs.get-prs-for-ci.outputs.numbers != '' runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 with: persist-credentials: false - # Install dependencies - name: Install Node.js uses: actions/setup-node@v2 with: node-version: ${{ env.NODE_VERSION }} + - name: Install node-core-utils run: npm install -g node-core-utils @@ -55,6 +55,6 @@ jobs: ncu-config set repo "$(echo ${{ github.repository }} | cut -d/ -f2)" - name: Start the CI - run: ./tools/actions/start-ci.sh ${{ needs.get_prs_for_ci.outputs.numbers }} + run: ./tools/actions/start-ci.sh ${{ needs.get-prs-for-ci.outputs.numbers }} env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/build-tarball.yml b/.github/workflows/build-tarball.yml index ebf6458889410f..0ea3633f0901af 100644 --- a/.github/workflows/build-tarball.yml +++ b/.github/workflows/build-tarball.yml @@ -25,13 +25,12 @@ on: - '!.github/workflows/build-tarball.yml' env: + PYTHON_VERSION: '3.10' FLAKY_TESTS: dontcare jobs: build-tarball: if: github.event.pull_request.draft == false - env: - PYTHON_VERSION: '3.10' runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 @@ -57,8 +56,6 @@ jobs: name: tarballs path: tarballs test-tarball-linux: - env: - PYTHON_VERSION: '3.10' needs: build-tarball runs-on: ubuntu-latest steps: diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml index 7c49f14fa64794..6442262f04091c 100644 --- a/.github/workflows/build-windows.yml +++ b/.github/workflows/build-windows.yml @@ -1,9 +1,9 @@ -name: build-windows +name: Build Windows on: pull_request: paths-ignore: - - "README.md" + - README.md - .github/** - '!.github/workflows/build-windows.yml' types: [opened, synchronize, reopened, ready_for_review] @@ -15,7 +15,7 @@ on: - v[0-9]+.x-staging - v[0-9]+.x paths-ignore: - - "README.md" + - README.md - .github/** - '!.github/workflows/build-windows.yml' diff --git a/.github/workflows/comment-labeled.yml b/.github/workflows/comment-labeled.yml index 2b70802d9adbf4..1a6b8cf15ec19b 100644 --- a/.github/workflows/comment-labeled.yml +++ b/.github/workflows/comment-labeled.yml @@ -1,4 +1,4 @@ -name: Comment on issues and PRs when labelled +name: Comment on issues and PRs when labeled on: issues: types: [labeled] @@ -12,7 +12,7 @@ env: FAST_TRACK_MESSAGE: Fast-track has been requested by @${{ github.actor }}. Please 👍 to approve. jobs: - staleComment: + stale-comment: if: github.repository == 'nodejs/node' && github.event.label.name == 'stalled' runs-on: ubuntu-latest steps: @@ -22,8 +22,8 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: gh issue comment "$NUMBER" --repo ${{ github.repository }} --body "$STALE_MESSAGE" - fastTrack: - if: github.repository == 'nodejs/node' && github.event_name == 'pull_request_target' && github.event.label.name == 'fast-track' + fast-track: + if: github.repository == 'nodejs/node' && github.event.issue.pull_request && github.event.label.name == 'fast-track' runs-on: ubuntu-latest steps: - name: Request Fast-Track diff --git a/.github/workflows/commit-lint.yml b/.github/workflows/commit-lint.yml index 524df2224074fc..56da77c36db733 100644 --- a/.github/workflows/commit-lint.yml +++ b/.github/workflows/commit-lint.yml @@ -1,4 +1,4 @@ -name: "First commit message adheres to guidelines at https://goo.gl/p2fr5Q" +name: First commit message adheres to guidelines at https://goo.gl/p2fr5Q on: [pull_request] diff --git a/.github/workflows/coverage-linux.yml b/.github/workflows/coverage-linux.yml index e6200f67e8b74a..7c1dc8c2d54036 100644 --- a/.github/workflows/coverage-linux.yml +++ b/.github/workflows/coverage-linux.yml @@ -1,4 +1,4 @@ -name: coverage-linux +name: Coverage Linux on: pull_request: @@ -11,9 +11,7 @@ on: - .github/** - '!.github/workflows/coverage-linux.yml' push: - branches: - - master - - main + branches: [master, main] paths-ignore: - '**.md' - 'benchmark/**' diff --git a/.github/workflows/coverage-windows.yml b/.github/workflows/coverage-windows.yml index f6bae771da43fd..178bb8eaae782c 100644 --- a/.github/workflows/coverage-windows.yml +++ b/.github/workflows/coverage-windows.yml @@ -1,4 +1,4 @@ -name: coverage-windows +name: Coverage Windows on: pull_request: @@ -12,9 +12,7 @@ on: - .github/** - '!.github/workflows/coverage-windows.yml' push: - branches: - - master - - main + branches: [master, main] paths-ignore: - '**.md' - 'benchmark/**' diff --git a/.github/workflows/misc.yml b/.github/workflows/doc.yml similarity index 94% rename from .github/workflows/misc.yml rename to .github/workflows/doc.yml index 7cfe2fdaa6dbd7..3cf114f94c067a 100644 --- a/.github/workflows/misc.yml +++ b/.github/workflows/doc.yml @@ -1,4 +1,4 @@ -name: misc +name: Test and upload documentation to artifacts on: pull_request: diff --git a/.github/workflows/license-builder.yml b/.github/workflows/license-builder.yml index 0f83e16194b37f..ff395511019ce6 100644 --- a/.github/workflows/license-builder.yml +++ b/.github/workflows/license-builder.yml @@ -1,4 +1,4 @@ -name: license update +name: License update on: schedule: # 00:00:00 every Monday diff --git a/.github/workflows/linters.yml b/.github/workflows/linters.yml index 166846ae3f8705..4e8b0e3845895a 100644 --- a/.github/workflows/linters.yml +++ b/.github/workflows/linters.yml @@ -1,4 +1,4 @@ -name: linters +name: Linters on: pull_request: @@ -121,7 +121,7 @@ jobs: lint-sh: if: github.event.pull_request.draft == false - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 with: diff --git a/.github/workflows/notify-force-push.yml b/.github/workflows/notify-force-push.yml index 9c2fc3a6a4e64d..e39fefdbda9d93 100644 --- a/.github/workflows/notify-force-push.yml +++ b/.github/workflows/notify-force-push.yml @@ -8,7 +8,7 @@ name: Notify on Force Push jobs: slackNotification: name: Slack Notification - if: ${{ github.event.forced && github.repository == 'nodejs/node' }} + if: github.repository == 'nodejs/node' && github.event.forced runs-on: ubuntu-latest steps: - name: Slack Notification diff --git a/.github/workflows/test-asan.yml b/.github/workflows/test-asan.yml index 29956196d0216f..ea2c8bf9cee5ef 100644 --- a/.github/workflows/test-asan.yml +++ b/.github/workflows/test-asan.yml @@ -1,4 +1,4 @@ -name: test-asan +name: Test ASan on: pull_request: diff --git a/.github/workflows/test-internet.yml b/.github/workflows/test-internet.yml index 94f4ab9086be6d..a7a3f80ff1b007 100644 --- a/.github/workflows/test-internet.yml +++ b/.github/workflows/test-internet.yml @@ -1,4 +1,4 @@ -name: test-internet +name: Test internet on: workflow_dispatch: @@ -7,8 +7,7 @@ on: pull_request: types: [opened, synchronize, reopened, ready_for_review] - paths: - - test/internet/** + paths: [test/internet/**] push: branches: - master @@ -16,8 +15,7 @@ on: - canary - v[0-9]+.x-staging - v[0-9]+.x - paths: - - test/internet/** + paths: [test/internet/**] env: PYTHON_VERSION: '3.10' diff --git a/.github/workflows/test-linux.yml b/.github/workflows/test-linux.yml index ba2244aa116bc3..3119df3c8af099 100644 --- a/.github/workflows/test-linux.yml +++ b/.github/workflows/test-linux.yml @@ -1,9 +1,9 @@ -name: test-linux +name: Test Linux on: pull_request: paths-ignore: - - "README.md" + - README.md - .github/** - '!.github/workflows/test-linux.yml' types: [opened, synchronize, reopened, ready_for_review] @@ -15,7 +15,7 @@ on: - v[0-9]+.x-staging - v[0-9]+.x paths-ignore: - - "README.md" + - README.md - .github/** - '!.github/workflows/test-linux.yml' diff --git a/.github/workflows/test-macos.yml b/.github/workflows/test-macos.yml index bdea886801a784..86a032419a8e09 100644 --- a/.github/workflows/test-macos.yml +++ b/.github/workflows/test-macos.yml @@ -1,4 +1,4 @@ -name: test-macOS +name: Test macOS on: pull_request: diff --git a/.github/workflows/tools.yml b/.github/workflows/tools.yml index 5750c41b0fc775..581c8859dad31b 100644 --- a/.github/workflows/tools.yml +++ b/.github/workflows/tools.yml @@ -1,4 +1,4 @@ -name: "tools update" +name: Tools update on: schedule: # Run once a week at 00:05 AM UTC on Saturday. @@ -7,7 +7,7 @@ on: workflow_dispatch: jobs: - tools_update: + tools-update: if: github.repository == 'nodejs/node' runs-on: ubuntu-latest strategy: