Repository navigation
Test fork CI pull requests merged with their base branch - #77131
Merged
Merged
Conversation
Fork CI tested the pushed commit as it is, while project CI tests the pull request merged into its base branch, so a branch on an old base could go green on code that was never tested merged. The tested base check only bounded that gap. Each job now merges the pushed commit with the base branch commit build-info fixed for the run, so fork CI tests what project CI would, and the monitor drops the overlap rule for a run that reports and verifies its merge. Generated-by: Claude Opus 5 Claude-Session: https://claude.ai/code/session_01NyQq9U7i5HhjDgrQ9qd3gq
GitHub reads a local action from the checkout before the step's inputs count, so a matrix entry that skips its checkout, or a constraints run that builds an older release, failed on the missing action even with nothing to merge. Generated-by: Claude Opus 5 Claude-Session: https://claude.ai/code/session_01NyQq9U7i5HhjDgrQ9qd3gq
A run that reported a merge tested that merge, not the head commit as it is, so comparing the head commit's own base could report CI passed for code no job ran, such as a pull request to a stable branch whose fork run merged with the test branch. Generated-by: Claude Opus 5 Claude-Session: https://claude.ai/code/session_01NyQq9U7i5HhjDgrQ9qd3gq
An unreadable job list looked like a run that merged nothing, so its head commit could be compared as tested as it is and the result kept in the marker, although its jobs may have tested a merge. Generated-by: Claude Opus 5 Claude-Session: https://claude.ai/code/session_01NyQq9U7i5HhjDgrQ9qd3gq
The local reproduction steps checked out the pushed commit, while the fork run tested it merged with the base branch, so a failure caused by the merged changes would not reproduce. Generated-by: Claude Opus 5 Claude-Session: https://claude.ai/code/session_01NyQq9U7i5HhjDgrQ9qd3gq
potiuk
requested review from
amoghrajesh,
ashb,
bugraoz93,
choo121600,
ephraimbuddy,
gopidesupavan,
jason810496,
jedcunningham,
jscheffl and
vatsrahul1001
as code owners
November 15, 2026 17:52
potiuk
enabled auto-merge (squash)
November 15, 2026 17:54
The CI image build checks out `checkout-ref` into the workspace, which can be a ref other than the workflow's own, so running a local action from it lets code of that ref run in privileged runs such as the scheduled canary (CodeQL actions/cache-poisoning/poisonable-step). Generated-by: Claude Opus 5 Claude-Session: https://claude.ai/code/session_01NyQq9U7i5HhjDgrQ9qd3gq
shahar1
approved these changes
Nov 15, 2026
1 task done
Contributor
Backport failed to create: v3-4-test. View the failure log Run detailsNote: As of Merging PRs targeted for Airflow 3.X In matter of doubt please ask in #release-management Slack channel.
You can attempt to backport this manually by running: cherry_picker 52487ed v3-4-testThis should apply the commit to the v3-4-test branch and leave the commit in conflict state marking After you have resolved the conflicts, you can continue the backport process by running: cherry_picker --continueIf you don't have cherry-picker installed, see the installation guide. |
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.
Fork CI tested the pushed commit as it is, while project CI's
pull_requestrun tests the pull request merged into its base branch. The "Tested base" check (#76837) only narrowed that gap:CI passedwaited for a base fewer than 200 commits behind with no overlapping files. This was one of the points raised in the cancelled ADIP-12 (AIP-120) vote. With this change, every job of a fork run tests the merge, as project CI does.How a fork run tests the merge
build-info's existing early conflict check (Harden fork CI change detection and conflict handling #76955) already fetches the target branch and finds the merge base. It now also outputs both asmerge-with, so the whole run merges with the same commit even if the target branch moves during the run..github/actions/merge-with-base, runs after each job's checkout of the pushed commit:git merge-tree --write-tree --merge-base, which needs no history between the commits.refs/pull/<n>/merge, so<merge>^..<merge>is exactly the pull request's changes.merge-withis threaded through every reusable workflow a fork run calls. It is empty in apache/airflow, where each merge step is skipped. The step'sif:matters because GitHub reads a local action from the checkout, which an older release ref or a skipped checkout doesn't have.gate,build-info,notify-slackandsummarize-warningskeep the pushed commit, because they read it or only report.<merge>^..<merge>, the whole pull request. Before, they diffed only the last pushed commit.breeze's "how to reproduce locally" steps now recreate the merge: fetch both commits, check out the pushed one,git mergethe base.check-fork-ci-tests-merge, keeps it that way. Every call must passmerge-with, and every job that checks out the pushed commit must run the merge step after its last checkout, guarded bymerge-with.How the monitor uses it
build-infonames the merge in a step: "Test merged with apache/airflow<branch>@<sha>, merge base<sha>".CI passedonly needs the merge to be fewer than 200 commits behind; the overlap rule no longer applies. The marker stores"merged": true, and the state comment andCI passedsay "merged with".CI passedis withheld. That covers a stable-branch PR, whose fork run merges with the test branch that shares its defaults. Such a PR is listed for Slack, and a maintainer can useuse project ci.The design doc (sections "Testing the merged result", "Tested base" and "Known limitations") and the contributor docs are updated.
Tested
main. The second parent is the head,M^..Mequals the PR's 6 changed files, and a second run produced the same merge SHA.Not tested yet
Was generative AI tooling used to co-author this PR?
Generated-by: Claude Code (Claude Opus 5) following the guidelines
🤖 Generated with Claude Code
https://claude.ai/code/session_01NyQq9U7i5HhjDgrQ9qd3gq