@@ -22,78 +22,152 @@ permissions:
2222 contents : read
2323
2424jobs :
25- get_mergeable_prs :
25+ get_candidate_prs :
2626 permissions :
2727 pull-requests : read
2828 if : github.repository == 'nodejs/node'
2929 runs-on : ubuntu-slim
3030 outputs :
31- numbers : ${{ steps.get_mergeable_prs .outputs.numbers }}
31+ candidates : ${{ steps.get_candidate_prs .outputs.candidates }}
3232 steps :
33- - name : Get Pull Requests
34- id : get_mergeable_prs
33+ - name : Get Pull Request Candidates
34+ id : get_candidate_prs
3535 run : |
36- prs=$(gh pr list \
36+ list_prs() {
37+ gh pr list \
3738 --repo "$GITHUB_REPOSITORY" \
3839 --base "$GITHUB_REF_NAME" \
3940 --label 'commit-queue' \
41+ "$@" \
4042 --json 'number' \
41- --search "created:<=$(date --date="2 days ago" +"%Y-%m-%dT%H:%M:%S%z") -label:blocked" \
4243 -t '{{ range . }}{{ .number }} {{ end }}' \
43- --limit 100)
44- fast_track_prs=$(gh pr list \
45- --repo "$GITHUB_REPOSITORY" \
46- --base "$GITHUB_REF_NAME" \
47- --label 'commit-queue' \
44+ --limit 100
45+ }
46+ aged_prs=$(list_prs \
47+ --search "created:<=$(date --date="2 days ago" +"%Y-%m-%dT%H:%M:%S%z") -label:blocked")
48+ fast_track_prs=$(list_prs \
4849 --label 'fast-track' \
49- --search "-label:blocked" \
50- --json 'number' \
51- -t '{{ range . }}{{ .number }} {{ end }}' \
52- --limit 100)
53- numbers=$(echo $prs' '$fast_track_prs | jq -r -s 'unique | join(" ")')
54- echo "numbers=$numbers" >> "$GITHUB_OUTPUT"
50+ --search "-label:blocked")
51+ candidates=$(printf '%s %s\n' "$fast_track_prs" "$aged_prs" |
52+ jq -r -s 'reduce .[] as $pr ([]; if index($pr) then . else . + [$pr] end) | join(" ")')
53+ echo "candidates=$candidates" >> "$GITHUB_OUTPUT"
5554env :
56- GITHUB_TOKEN : ${{ secrets.GITHUB_TOKEN }}
55+ GH_TOKEN : ${{ github.token }}
5756 commitQueue :
58- needs : get_mergeable_prs
59- if : needs.get_mergeable_prs.outputs.numbers != ''
57+ needs : get_candidate_prs
58+ if : needs.get_candidate_prs.outputs.candidates != ''
59+ permissions :
60+ checks : read
61+ contents : read
62+ pull-requests : read
63+ statuses : read
6064 runs-on : ubuntu-slim
6165 steps :
62- - uses : actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
63- with :
64- # A personal token is required because pushing with GITHUB_TOKEN will
65- # prevent commits from running CI after they land. It needs
66- # to be set here because `checkout` configures GitHub authentication
67- # for push as well.
68- token : ${{ secrets.GH_USER_TOKEN }}
69-
70- # Install dependencies
7166 - name : Install Node.js
7267 uses : actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
7368 with :
7469 node-version : ${{ env.NODE_VERSION }}
70+
7571 - name : Install @node-core/utils
7672 run : npm install -g @node-core/utils
7773
78- - name : Set variables
79- run : |
80- echo "REPOSITORY=$(echo "$GITHUB_REPOSITORY" | cut -d/ -f2)" >> "$GITHUB_ENV"
81-
8274 - name : Configure @node-core/utils
8375 run : |
84- ncu-config set branch "${GITHUB_REF_NAME}"
85- ncu-config set upstream origin
86- ncu-config set username "$USERNAME"
87- ncu-config set token "$GITHUB_TOKEN"
88- ncu-config set jenkins_token "$JENKINS_TOKEN"
89- ncu-config set repo "${REPOSITORY}"
90- ncu-config set owner "${GITHUB_REPOSITORY_OWNER}"
76+ # Keep the config outside the workspace so checkout does not remove it.
77+ ncu-config --global set branch "${GITHUB_REF_NAME}"
78+ ncu-config --global set upstream origin
79+ ncu-config --global set username "$USERNAME"
80+ ncu-config --global set token "$GH_TOKEN"
81+ ncu-config --global set jenkins_token "$JENKINS_TOKEN"
82+ ncu-config --global set repo "${GITHUB_REPOSITORY#*/}"
83+ ncu-config --global set owner "${GITHUB_REPOSITORY_OWNER}"
9184env :
9285 USERNAME : ${{ secrets.JENKINS_USER }}
93- GITHUB_TOKEN : ${{ secrets.GH_USER_TOKEN }}
86+ GH_TOKEN : ${{ github.token }}
9487 JENKINS_TOKEN : ${{ secrets.JENKINS_TOKEN }}
9588
89+ - name : Filter Pull Requests
90+ id : get_mergeable_prs
91+ run : |
92+ readme="${RUNNER_TEMP}/README.md"
93+ curl -fsSLo "$readme" "https://github.com/${GITHUB_REPOSITORY}/raw/${GITHUB_SHA}/README.md"
94+
95+ numbers=
96+ # shellcheck disable=SC2086
97+ for pr in $CANDIDATES; do
98+ metadata="${RUNNER_TEMP}/metadata-${pr}.json"
99+ output="${RUNNER_TEMP}/metadata-${pr}.txt"
100+ if git node metadata "$pr" \
101+ --readme "$readme" \
102+ --json > "$metadata" 2> "$output"; then
103+ metadata_status=0
104+ else
105+ metadata_status=$?
106+ fi
107+
108+ if [ -s "$output" ]; then
109+ cat "$output"
110+ fi
111+
112+ case "$metadata_status" in
113+ 0|2[0-9]|4[0-9]) ;;
114+ *)
115+ echo "git node metadata failed for pr ${pr} with exit code ${metadata_status}"
116+ exit 1
117+ ;;
118+ esac
119+
120+ metadata_exit_code=$(jq -r '.exitCode' "$metadata") || {
121+ echo "failed to parse metadata JSON for pr ${pr}"
122+ exit 1
123+ }
124+ if [ "$metadata_exit_code" != "$metadata_status" ]; then
125+ echo "metadata JSON exitCode mismatch for pr ${pr}"
126+ exit 1
127+ fi
128+ metadata_reason_codes=$(jq -r '.reasonCodes | join(", ")' "$metadata") || {
129+ echo "failed to parse metadata reason codes for pr ${pr}"
130+ exit 1
131+ }
132+
133+ if [ "$metadata_status" -eq 0 ]; then
134+ echo "pr ${pr} is ready for the commit queue"
135+ numbers="$numbers $pr"
136+ continue
137+ fi
138+
139+ if [ "$metadata_status" -ge 20 ] && [ "$metadata_status" -le 29 ]; then
140+ echo "pr ${pr} skipped, not ready to land"
141+ echo "reason codes: ${metadata_reason_codes}"
142+ continue
143+ fi
144+
145+ echo "pr ${pr} will be handled by the commit queue"
146+ echo "reason codes: ${metadata_reason_codes}"
147+ numbers="$numbers $pr"
148+ done
149+
150+ numbers=$(echo "$numbers" | xargs)
151+ echo "numbers=$numbers" >> "$GITHUB_OUTPUT"
152+ env :
153+ CANDIDATES : ${{ needs.get_candidate_prs.outputs.candidates }}
154+ GH_TOKEN : ${{ github.token }}
155+
156+ - uses : actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
157+ if : steps.get_mergeable_prs.outputs.numbers != ''
158+ with :
159+ # A personal token is required because pushing with GITHUB_TOKEN will
160+ # prevent commits from running CI after they land. It needs
161+ # to be set here because `checkout` configures GitHub authentication
162+ # for push as well.
163+ token : ${{ secrets.GH_USER_TOKEN }}
164+
96165 - name : Start the Commit Queue
97- run : ./tools/actions/commit-queue.sh "${GITHUB_REPOSITORY_OWNER}" "${REPOSITORY}" ${{ needs.get_mergeable_prs.outputs.numbers }}
166+ if : steps.get_mergeable_prs.outputs.numbers != ''
167+ run : |
168+ git config --local user.email "github-bot@iojs.org"
169+ git config --local user.name "Node.js GitHub Bot"
170+ ncu-config set token "$GH_TOKEN"
171+ ./tools/actions/commit-queue.sh ${{ steps.get_mergeable_prs.outputs.numbers }}
98172env :
99- GITHUB_TOKEN : ${{ secrets.GH_USER_TOKEN }}
173+ GH_TOKEN : ${{ secrets.GH_USER_TOKEN }}
0 commit comments