File tree Expand file tree Collapse file tree 2 files changed +8
-5
lines changed Expand file tree Collapse file tree 2 files changed +8
-5
lines changed Original file line number Diff line number Diff line change 2525 get_mergeable_prs :
2626 permissions :
2727 pull-requests : read
28- if : github.repository == 'nodejs/node'
28+ if : github.repository == 'nodejs/node-auto-test '
2929 runs-on : ubuntu-latest
3030 outputs :
3131 numbers : ${{ steps.get_mergeable_prs.outputs.numbers }}
5555 env :
5656 GITHUB_TOKEN : ${{ secrets.GITHUB_TOKEN }}
5757 commitQueue :
58+ permissions :
59+ contents : write
60+ pull-requests : write
5861 needs : get_mergeable_prs
5962 if : needs.get_mergeable_prs.outputs.numbers != ''
6063 runs-on : ubuntu-latest
6871 # prevent commits from running CI after they land. It needs
6972 # to be set here because `checkout` configures GitHub authentication
7073 # for push as well.
71- token : ${{ secrets.GH_USER_TOKEN }}
74+ token : ${{ secrets.GITHUB_TOKEN }}
7275
7376 # Install dependencies
7477 - name : Install Node.js
@@ -94,10 +97,10 @@ jobs:
9497 ncu-config set owner "${OWNER}"
9598 env :
9699 USERNAME : ${{ secrets.JENKINS_USER }}
97- GH_TOKEN : ${{ secrets.GH_USER_TOKEN }}
100+ GH_TOKEN : ${{ secrets.GITHUB_TOKEN }}
98101 JENKINS_TOKEN : ${{ secrets.JENKINS_TOKEN }}
99102
100103 - name : Start the Commit Queue
101104 run : ./tools/actions/commit-queue.sh ${{ env.OWNER }} ${{ env.REPOSITORY }} ${{ needs.get_mergeable_prs.outputs.numbers }}
102105 env :
103- GITHUB_TOKEN : ${{ secrets.GH_USER_TOKEN }}
106+ GITHUB_TOKEN : ${{ secrets.GITHUB_TOKEN }}
Original file line number Diff line number Diff line change @@ -86,7 +86,7 @@ for pr in "$@"; do
8686 commit_body=$( git log -1 --pretty=' format:%b' )
8787 commit_head=$( grep ' Fetched commits as' output | cut -d. -f3 | xargs git rev-parse)
8888
89- if ! gh pr merge " $pr " --squash --body " $commit_body " --subject " $commit_title " --match-head-commit " $commit_head " > output; then
89+ if ! gh pr merge " $pr " --squash --body " $commit_body " --subject " $commit_title " --match-head-commit " $commit_head " --admin > output; then
9090 commit_queue_failed " $pr "
9191 continue
9292 fi
You can’t perform that action at this time.
0 commit comments