Commit d341561
build: fix commit-queue default branch
`github.repository.default_branch` is not a valid context variable, and
GitHub doesn't have a context or environment variable containing the
default branch. It does have `github.ref` and `$GITHUB_REF`, which
contains the default branch _reference_ (as in `refs/heads/<branch>`),
so we can use that and remove the `refs/heads/` prefix.
PR-URL: #38998
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Robert Nagy <ronagy@icloud.com>1 parent 1023433 commit d341561
1 file changed
Lines changed: 6 additions & 5 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -45,6 +45,7 @@ jobs: | |||
| 45 | 45 | run: | | |
| 46 | 46 | echo "REPOSITORY=$(echo ${{ github.repository }} | cut -d/ -f2)" >> $GITHUB_ENV | |
| 47 | 47 | echo "OWNER=${{ github.repository_owner }}" >> $GITHUB_ENV | |
| 48 | + echo "DEFAULT_BRANCH=${GITHUB_REF#refs/heads/}" >> $GITHUB_ENV | ||
| 48 | 49 | ||
| 49 | 50 | - name: Get Pull Requests | |
| 50 | 51 | uses: octokit/graphql-action@v2.x | |
@@ -63,19 +64,19 @@ jobs: | |||
| 63 | 64 | owner: ${{ env.OWNER }} | |
| 64 | 65 | repo: ${{ env.REPOSITORY }} | |
| 65 | 66 | # Commit queue is only enabled for the default branch on the repository | |
| 66 | - base_ref: ${{ github.repository.default_branch }} | ||
| 67 | + base_ref: ${{ env.DEFAULT_BRANCH }} | ||
| 67 | 68 | env: | |
| 68 | 69 | GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} | |
| 69 | 70 | ||
| 70 | 71 | - name: Configure node-core-utils | |
| 71 | 72 | run: | | |
| 72 | - ncu-config set branch ${{ github.repository.default_branch }} | ||
| 73 | + ncu-config set branch ${DEFAULT_BRANCH} | ||
| 73 | 74 | ncu-config set upstream origin | |
| 74 | 75 | ncu-config set username "${{ secrets.GH_USER_NAME }}" | |
| 75 | 76 | ncu-config set token "${{ secrets.GH_USER_TOKEN }}" | |
| 76 | 77 | ncu-config set jenkins_token "${{ secrets.JENKINS_TOKEN }}" | |
| 77 | - ncu-config set repo "${{ env.REPOSITORY }}" | ||
| 78 | - ncu-config set owner "${{ env.OWNER }}" | ||
| 78 | + ncu-config set repo "${REPOSITORY}" | ||
| 79 | + ncu-config set owner "${OWNER}" | ||
| 79 | 80 | ||
| 80 | 81 | - name: Start the commit queue | |
| 81 | - run: ./tools/actions/commit-queue.sh ${{ env.OWNER }} ${{ env.REPOSITORY }} ${{ secrets.GITHUB_TOKEN }} $(echo '${{ steps.get_mergable_pull_requests.outputs.data }}' | jq '.repository.pullRequests.nodes | map(.number) | .[]') | ||
| 82 | + run: ./tools/actions/commit-queue.sh ${OWNER} ${REPOSITORY} ${{ secrets.GITHUB_TOKEN }} $(echo '${{ steps.get_mergable_pull_requests.outputs.data }}' | jq '.repository.pullRequests.nodes | map(.number) | .[]') | ||
0 commit comments