Skip to content

Commit

Permalink
add resume-ci label
Browse files Browse the repository at this point in the history
  • Loading branch information
MoLow committed Jul 21, 2022
1 parent 2fd4c01 commit 2932675
Show file tree
Hide file tree
Showing 4 changed files with 102 additions and 2 deletions.
70 changes: 70 additions & 0 deletions .github/workflows/auto-resume-ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
name: Auto Start CI

on:
schedule:
# Runs every five minutes (fastest the scheduler can run). Five minutes is
# optimistic, it can take longer to run.
# To understand why `schedule` is used instead of other events, refer to
# ./doc/contributing/commit-queue.md
- cron: '*/5 * * * *'

concurrency: ${{ github.workflow }}

env:
NODE_VERSION: lts/*

permissions:
contents: read

jobs:
get-prs-for-ci:
permissions:
pull-requests: read
if: github.repository == 'nodejs/node'
runs-on: ubuntu-latest
outputs:
numbers: ${{ steps.get_prs_for_ci.outputs.numbers }}
steps:
- name: Get Pull Requests
id: get_prs_for_ci
run: >
gh pr list \
--repo ${{ github.repository }} \
--label 'resume-ci' \
--json 'number' \
-t '::set-output name=numbers::{{ range . }}{{ .number }} {{ end }}' \
--limit 100
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
start-ci:
permissions:
contents: read
pull-requests: write
needs: get-prs-for-ci
if: needs.get-prs-for-ci.outputs.numbers != ''
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
with:
persist-credentials: false

- name: Install Node.js
uses: actions/setup-node@v3
with:
node-version: ${{ env.NODE_VERSION }}

- name: Install node-core-utils
run: npm install -g node-core-utils

- name: Setup node-core-utils
run: |
ncu-config set username ${{ secrets.JENKINS_USER }}
ncu-config set token none
ncu-config set jenkins_token ${{ secrets.JENKINS_TOKEN }}
ncu-config set owner "${{ github.repository_owner }}"
ncu-config set repo "$(echo ${{ github.repository }} | cut -d/ -f2)"
- name: Resume the CI Runs
run: ./tools/actions/resume-ci.sh ${{ needs.get-prs-for-ci.outputs.numbers }}
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
4 changes: 2 additions & 2 deletions doc/contributing/commit-queue.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ From a high-level, the Commit Queue works as follow:
1. Collaborators will add `commit-queue` label to pull requests ready to land
2. Every five minutes the queue will do the following for each pull request
with the label:
1. Check if the PR also has a `request-ci` label (if it has, skip this PR
1. Check if the PR also has a `request-ci` or `resume-ci` label (if it has, skip this PR
since it's pending a CI run)
2. Check if the last Jenkins CI is finished running (if it is not, skip this
PR)
Expand Down Expand Up @@ -98,7 +98,7 @@ that into a list of PR ids we can pass as arguments to

The script will iterate over the pull requests. `ncu-ci` is used to check if
the last CI is still pending, and calls to the GitHub API are used to check if
the PR is waiting for CI to start (`request-ci` label). The PR is skipped if CI
the PR is waiting for CI to start (`request-ci` pr `resume-ci` label). The PR is skipped if CI
is pending. No other CI validation is done here since `git node land` will fail
if the last CI failed.

Expand Down
4 changes: 4 additions & 0 deletions tools/actions/commit-queue.sh
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,10 @@ for pr in "$@"; do
echo "pr ${pr} skipped, waiting for CI to start"
continue
fi
if jq -e 'map(.name) | index("resume-ci")' < labels.json; then
echo "pr ${pr} skipped, waiting for CI to start"
continue
fi

# Skip PR if CI is still running
if gh pr checks "$pr" | grep -q "\spending\s"; then
Expand Down
26 changes: 26 additions & 0 deletions tools/actions/resume-ci.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
#!/bin/sh

set -xe

RESUME_CI_LABEL="resume-ci"
RESUME_CI_FAILED_LABEL="resume-ci-failed"

for pr in "$@"; do
gh pr edit "$pr" --remove-label "$RESUME_CI_LABEL"

ci_started=yes
rm -f output;
ncu-ci resume "$pr" >output 2>&1 || ci_started=no
cat output

if [ "$ci_started" = "no" ]; then
# Do we need to reset?
gh pr edit "$pr" --add-label "$RESUME_CI_FAILED_LABEL"

jq -n --arg content "<details><summary>Couldn't resume CI</summary><pre>$(cat output || true)</pre></details>" > output.json

gh pr comment "$pr" --body-file output.json

rm output.json;
fi
done;

0 comments on commit 2932675

Please sign in to comment.