Skip to content

Stop late draft runs cancelling real PR CI #1708

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Mikola Lysenko (mikolalysenko) wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Stop late draft runs cancelling real PR CI #1708

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,13 @@ permissions:
# queued push but the newest during a merge burst, and most main commits never
# got a verdict. Merge-group refs (gh-readonly-queue/...) are unique per queue
# entry already. The nightly keeps its own group so it never queues behind (or
# cancels) a push.
# cancels) a push. Draft PR runs get their own group too: a push followed at
# once by `gh pr ready` can deliver the push's `synchronize` (payload still
# draft) after `ready_for_review`. In a shared group that late draft run
# cancelled the real run, skipped every job, and left ci-ok green on a head
# nothing had tested.
concurrency:
group: ci-${{ github.event.pull_request.number || (github.event_name == 'push' && github.sha) || github.ref }}${{ github.event_name == 'schedule' && '-nightly' || '' }}
group: ci-${{ github.event.pull_request.number || (github.event_name == 'push' && github.sha) || github.ref }}${{ github.event_name == 'schedule' && '-nightly' || '' }}${{ github.event.pull_request.draft && '-draft' || '' }}
cancel-in-progress: ${{ github.event_name == 'pull_request' }}

# Linux jobs run on Depot's runners (depot-ubuntu-*-4: 4 vCPU, like GitHub's
Expand Down
7 changes: 7 additions & 0 deletions scripts/tests/test_ci_scheduling.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,13 @@ def test_unchanged_pr_merge_skips_only_what_the_queue_re_tests(self):
self.assertIn("if: github.event_name == 'pull_request' && github.base_ref == 'main'"
" && github.head_ref != 'release/v5-prerelease'", owner)

def test_late_draft_run_cannot_cancel_the_ready_run(self):
# A push's draft-payload `synchronize` can land after `ready_for_review`
# on the same head; sharing a group, it cancelled the real run and left
# ci-ok green with every job skipped.
group = re.search(r"^concurrency:\n group: (.*)$", TEXT, re.M)[1]
self.assertIn("github.event.pull_request.draft && '-draft'", group)

def test_row_reader_preserves_both_os_siblings(self):
jobs = reader.jobs("""jobs:
example:
Expand Down
Loading