File tree 2 files changed +8
-5
lines changed
2 files changed +8
-5
lines changed Original file line number Diff line number Diff line change 25
25
get_mergeable_prs :
26
26
permissions :
27
27
pull-requests : read
28
- if : github.repository == 'nodejs/node'
28
+ if : github.repository == 'nodejs/node-auto-test '
29
29
runs-on : ubuntu-latest
30
30
outputs :
31
31
numbers : ${{ steps.get_mergeable_prs.outputs.numbers }}
55
55
env :
56
56
GITHUB_TOKEN : ${{ secrets.GITHUB_TOKEN }}
57
57
commitQueue :
58
+ permissions :
59
+ contents : write
60
+ pull-requests : write
58
61
needs : get_mergeable_prs
59
62
if : needs.get_mergeable_prs.outputs.numbers != ''
60
63
runs-on : ubuntu-latest
68
71
# prevent commits from running CI after they land. It needs
69
72
# to be set here because `checkout` configures GitHub authentication
70
73
# for push as well.
71
- token : ${{ secrets.GH_USER_TOKEN }}
74
+ token : ${{ secrets.GITHUB_TOKEN }}
72
75
73
76
# Install dependencies
74
77
- name : Install Node.js
@@ -94,10 +97,10 @@ jobs:
94
97
ncu-config set owner "${OWNER}"
95
98
env :
96
99
USERNAME : ${{ secrets.JENKINS_USER }}
97
- GH_TOKEN : ${{ secrets.GH_USER_TOKEN }}
100
+ GH_TOKEN : ${{ secrets.GITHUB_TOKEN }}
98
101
JENKINS_TOKEN : ${{ secrets.JENKINS_TOKEN }}
99
102
100
103
- name : Start the Commit Queue
101
104
run : ./tools/actions/commit-queue.sh ${{ env.OWNER }} ${{ env.REPOSITORY }} ${{ needs.get_mergeable_prs.outputs.numbers }}
102
105
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
86
86
commit_body=$( git log -1 --pretty=' format:%b' )
87
87
commit_head=$( grep ' Fetched commits as' output | cut -d. -f3 | xargs git rev-parse)
88
88
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
90
90
commit_queue_failed " $pr "
91
91
continue
92
92
fi
You can’t perform that action at this time.
0 commit comments