Repository navigation
Cancel the runs of merged pull requests when they merge - #75683
Merged
Merged
Conversation
The fork CI monitor cancelled them on its 15-minute schedule, so runs of a merged pull request kept holding runners for up to 15 minutes, and stuck ones for 30 more before being force-cancelled. Merging pushes to the target branch, which lets a push-triggered workflow find the merged pull request directly and cancel its runs right away, without the monitor's search over every unfinished run. Generated-by: Claude Opus 5
potiuk
requested review from
amoghrajesh,
ashb,
bugraoz93,
choo121600,
ephraimbuddy,
gopidesupavan,
jason810496,
jedcunningham,
jscheffl and
vatsrahul1001
as code owners
October 26, 2026 17:49
shahar1
approved these changes
Oct 26, 2026
Contributor
Backport successfully created: v3-4-testNote: As of Merging PRs targeted for Airflow 3.X In matter of doubt please ask in #release-management Slack channel.
|
github-actions Bot
pushed a commit
to aws-mwaa/upstream-to-airflow
that referenced
this pull request
Oct 26, 2026
…pache#75683) The fork CI monitor cancelled them on its 15-minute schedule, so runs of a merged pull request kept holding runners for up to 15 minutes, and stuck ones for 30 more before being force-cancelled. Merging pushes to the target branch, which lets a push-triggered workflow find the merged pull request directly and cancel its runs right away, without the monitor's search over every unfinished run. (cherry picked from commit bfb620d) Co-authored-by: Jarek Potiuk <jarek@potiuk.com> Generated-by: Claude Opus 5
potiuk
added a commit
that referenced
this pull request
Oct 26, 2026
…75683) (#75687) The fork CI monitor cancelled them on its 15-minute schedule, so runs of a merged pull request kept holding runners for up to 15 minutes, and stuck ones for 30 more before being force-cancelled. Merging pushes to the target branch, which lets a push-triggered workflow find the merged pull request directly and cancel its runs right away, without the monitor's search over every unfinished run. (cherry picked from commit bfb620d) Generated-by: Claude Opus 5 Co-authored-by: Jarek Potiuk <jarek@potiuk.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Moves the cancelling of merged pull requests' runs from the fork CI monitor's 15-minute schedule to a workflow triggered by the merge itself, as recommended in apache/infrastructure-website#323. Until now a merged pull request's runs kept holding runners for up to 15 minutes, and stuck ones for 30 more before being force-cancelled.
cancel-merged-pr-runs.ymlruns onpushto the branches pull requests merge into. It looks up the merged pull request of the pushed commit and cancels its unfinishedpull_requestruns created before the merge, matched by head repository and commit so fork pull requests are covered too. It skips heads still used by an open pull request, and force-cancels runs still going five minutes later. The lookup retries for up to a minute, since GitHub associates the merge commit with its pull request a few seconds after the push. It runs onubuntu-slimwithghonly, without installing Breeze, so it cancels within about a minute of the merge.The scheduled implementation from #75619 is reverted (module, tests,
cancel_merged_runsconfig flag and the reconciler hook), and the design moves from the fork CI document to05_workflows.md.A push runs the workflow file of the pushed branch, so release branches need the workflow backported to get the same behaviour.
Checks run locally: fork-CI breeze tests (419 passed), shellcheck of the workflow script,
prekhooks on the changed files (all passed except lychee, which needs Docker). The script was dry-run (cancel calls replaced byecho) against recent merges of fork and in-repo pull requests and matched their runs; a failed lookup fails the job.Was generative AI tooling used to co-author this PR?
Generated-by: Claude Opus 5 following the guidelines
🤖 Generated with Claude Code