Commit c44185c
tools: fix GitHub Actions status when CQ is empty
Refs: #40985 (comment)
PR-URL: #41193
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>1 parent 74742c3 commit c44185c
2 files changed
Lines changed: 42 additions & 14 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -12,9 +12,27 @@ env: | |||
| 12 | 12 | NODE_VERSION: lts/* | |
| 13 | 13 | ||
| 14 | 14 | jobs: | |
| 15 | - startCI: | ||
| 15 | + get_prs_for_ci: | ||
| 16 | 16 | if: github.repository == 'nodejs/node' | |
| 17 | 17 | runs-on: ubuntu-latest | |
| 18 | + outputs: | ||
| 19 | + numbers: ${{ steps.get_prs_for_ci.outputs.numbers }} | ||
| 20 | + steps: | ||
| 21 | + - name: Get Pull Requests | ||
| 22 | + id: get_prs_for_ci | ||
| 23 | + run: > | ||
| 24 | + gh pr list \ | ||
| 25 | + --repo ${{ github.repository }} \ | ||
| 26 | + --label 'request-ci' \ | ||
| 27 | + --json 'number' \ | ||
| 28 | + -t '::set-output name=numbers::{{ range . }}{{ .number }} {{ end }}' \ | ||
| 29 | + --limit 100 | ||
| 30 | + env: | ||
| 31 | + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} | ||
| 32 | + startCI: | ||
| 33 | + needs: get_prs_for_ci | ||
| 34 | + if: needs.get_prs_for_ci.outputs.numbers != '' | ||
| 35 | + runs-on: ubuntu-latest | ||
| 18 | 36 | steps: | |
| 19 | 37 | - uses: actions/checkout@v2 | |
| 20 | 38 | with: | |
@@ -37,8 +55,6 @@ jobs: | |||
| 37 | 55 | ncu-config set repo "$(echo ${{ github.repository }} | cut -d/ -f2)" | |
| 38 | 56 | ||
| 39 | 57 | - name: Start the CI | |
| 40 | - run: | | ||
| 41 | - PRs=$(gh pr list --label 'request-ci' --json number --jq 'map(.number) | .[]' --limit 100) | ||
| 42 | - ./tools/actions/start-ci.sh "$PRs" | ||
| 58 | + run: ./tools/actions/start-ci.sh "${{ needs.get_prs_for_ci.outputs.numbers }}" | ||
| 43 | 59 | env: | |
| 44 | 60 | GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -17,9 +17,28 @@ env: | |||
| 17 | 17 | NODE_VERSION: lts/* | |
| 18 | 18 | ||
| 19 | 19 | jobs: | |
| 20 | - commitQueue: | ||
| 20 | + get_mergeable_prs: | ||
| 21 | 21 | if: github.repository == 'nodejs/node' | |
| 22 | 22 | runs-on: ubuntu-latest | |
| 23 | + outputs: | ||
| 24 | + numbers: ${{ steps.get_mergeable_prs.outputs.numbers }} | ||
| 25 | + steps: | ||
| 26 | + - name: Get Pull Requests | ||
| 27 | + id: get_mergeable_prs | ||
| 28 | + run: > | ||
| 29 | + gh pr list \ | ||
| 30 | + --repo ${{ github.repository }} \ | ||
| 31 | + --base ${{ github.ref_name }} \ | ||
| 32 | + --label 'commit-queue' \ | ||
| 33 | + --json 'number' \ | ||
| 34 | + -t '::set-output name=numbers::{{ range . }}{{ .number }} {{ end }}' \ | ||
| 35 | + --limit 100 | ||
| 36 | + env: | ||
| 37 | + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} | ||
| 38 | + commitQueue: | ||
| 39 | + needs: get_mergeable_prs | ||
| 40 | + if: needs.get_mergeable_prs.outputs.numbers != '' | ||
| 41 | + runs-on: ubuntu-latest | ||
| 23 | 42 | steps: | |
| 24 | 43 | - uses: actions/checkout@v2 | |
| 25 | 44 | with: | |
@@ -44,11 +63,10 @@ jobs: | |||
| 44 | 63 | run: | | |
| 45 | 64 | echo "REPOSITORY=$(echo ${{ github.repository }} | cut -d/ -f2)" >> $GITHUB_ENV | |
| 46 | 65 | echo "OWNER=${{ github.repository_owner }}" >> $GITHUB_ENV | |
| 47 | - echo "DEFAULT_BRANCH=${GITHUB_REF#refs/heads/}" >> $GITHUB_ENV | ||
| 48 | 66 | ||
| 49 | 67 | - name: Configure node-core-utils | |
| 50 | 68 | run: | | |
| 51 | - ncu-config set branch ${DEFAULT_BRANCH} | ||
| 69 | + ncu-config set branch ${GITHUB_REF_NAME} | ||
| 52 | 70 | ncu-config set upstream origin | |
| 53 | 71 | ncu-config set username "${{ secrets.GH_USER_NAME }}" | |
| 54 | 72 | ncu-config set token "${{ secrets.GH_USER_TOKEN }}" | |
@@ -57,12 +75,6 @@ jobs: | |||
| 57 | 75 | ncu-config set owner "${OWNER}" | |
| 58 | 76 | ||
| 59 | 77 | - name: Start the Commit Queue | |
| 60 | - run: | | ||
| 61 | - PRs=$(gh pr list \ | ||
| 62 | - --base ${{ env.DEFAULT_BRANCH }} \ | ||
| 63 | - --label 'commit-queue' \ | ||
| 64 | - --json number --jq 'map(.number) | .[]' \ | ||
| 65 | - --limit 100) | ||
| 66 | - ./tools/actions/commit-queue.sh ${{ env.OWNER }} ${{ env.REPOSITORY }} "$PRs" | ||
| 78 | + run: ./tools/actions/commit-queue.sh ${{ env.OWNER }} ${{ env.REPOSITORY }} "${{ needs.get_mergeable_prs.outputs.numbers }}" | ||
| 67 | 79 | env: | |
| 68 | 80 | GITHUB_TOKEN: ${{ secrets.GH_USER_TOKEN }} | |
0 commit comments