airflow-ctl release: use fast-forward for -test → -stable sync by potiuk · Pull Request #65637 · apache/airflow

potiuk · 2026-04-21T21:59:00Z

Squash- and rebase-merges both rewrite the commit SHAs from `-test` onto `-stable`. That means the rc tag cut from `-stable` afterwards points at a different commit than the release-prep PR reviewed and merged into `-test` — so the tag, the testing-status issue, and the SVN source tarball all disagree on what the release manager actually reviewed.

Fast-forward preserves the original SHAs on `-stable` and makes it a clean extension of `-test`, which is what the rc tag + testing-status issue + SVN source tarball all need to agree on.

Caught while preparing airflow-ctl 0.1.4rc3 — the initial sync PR was squash-merged, which produced a new commit on `-stable` with a different SHA than the release-prep PR #65634 on `-test`. The sync was redone as a fast-forward before cutting the rc3 tag.

Branch protection on `airflow-ctl/vX-Y-stable` enforces `required_linear_history: true`, which already permits fast-forward, squash, and rebase — so INFRA will accept the fast-forward push as long as the sync PR was reviewed.

Test plan

N/A — doc-only change.

Was generative AI tooling used to co-author this PR?

Yes — Claude Opus 4.7 (1M context)

Generated-by: Claude Opus 4.7 (1M context) following the guidelines

Squash- and rebase-merges both rewrite the commit SHAs from -test onto -stable, which means the subsequent rc tag points at a different commit than the release-prep PR that was reviewed and merged into -test. Fast-forward preserves the original SHAs so the tag, the testing-status issue, and the SVN source tarball all reference the same commit the contributors reviewed. Caught during 0.1.4rc3 prep — the initial sync PR was squash-merged and had to be redone as a fast-forward before tagging.

github-actions · 2026-04-21T23:38:50Z

Backport failed to create: v3-2-test. View the failure log Run details

Note: As of Merging PRs targeted for Airflow 3.X
the committer who merges the PR is responsible for backporting the PRs that are bug fixes (generally speaking) to the maintenance branches.

In matter of doubt please ask in #release-management Slack channel.

Status	Branch	Result
❌	v3-2-test

You can attempt to backport this manually by running:

cherry_picker 1f984f3 v3-2-test

This should apply the commit to the v3-2-test branch and leave the commit in conflict state marking
the files that need manual conflict resolution.

After you have resolved the conflicts, you can continue the backport process by running:

cherry_picker --continue

If you don't have cherry-picker installed, see the installation guide.

…pache#65637) Squash- and rebase-merges both rewrite the commit SHAs from -test onto -stable, which means the subsequent rc tag points at a different commit than the release-prep PR that was reviewed and merged into -test. Fast-forward preserves the original SHAs so the tag, the testing-status issue, and the SVN source tarball all reference the same commit the contributors reviewed. Caught during 0.1.4rc3 prep — the initial sync PR was squash-merged and had to be redone as a fast-forward before tagging.

potiuk · 2026-04-21T21:59:00Z

Squash- and rebase-merges both rewrite the commit SHAs from `-test` onto `-stable`. That means the rc tag cut from `-stable` afterwards points at a different commit than the release-prep PR reviewed and merged into `-test` — so the tag, the testing-status issue, and the SVN source tarball all disagree on what the release manager actually reviewed.

Fast-forward preserves the original SHAs on `-stable` and makes it a clean extension of `-test`, which is what the rc tag + testing-status issue + SVN source tarball all need to agree on.

Caught while preparing airflow-ctl 0.1.4rc3 — the initial sync PR was squash-merged, which produced a new commit on `-stable` with a different SHA than the release-prep PR #65634 on `-test`. The sync was redone as a fast-forward before cutting the rc3 tag.

Branch protection on `airflow-ctl/vX-Y-stable` enforces `required_linear_history: true`, which already permits fast-forward, squash, and rebase — so INFRA will accept the fast-forward push as long as the sync PR was reviewed.

Test plan

N/A — doc-only change.

Was generative AI tooling used to co-author this PR?

Yes — Claude Opus 4.7 (1M context)

Generated-by: Claude Opus 4.7 (1M context) following the guidelines

Squash- and rebase-merges both rewrite the commit SHAs from -test onto -stable, which means the subsequent rc tag points at a different commit than the release-prep PR that was reviewed and merged into -test. Fast-forward preserves the original SHAs so the tag, the testing-status issue, and the SVN source tarball all reference the same commit the contributors reviewed. Caught during 0.1.4rc3 prep — the initial sync PR was squash-merged and had to be redone as a fast-forward before tagging.

github-actions · 2026-04-21T23:38:50Z

Backport failed to create: v3-2-test. View the failure log Run details

Note: As of Merging PRs targeted for Airflow 3.X
the committer who merges the PR is responsible for backporting the PRs that are bug fixes (generally speaking) to the maintenance branches.

In matter of doubt please ask in #release-management Slack channel.

Status	Branch	Result
❌	v3-2-test

You can attempt to backport this manually by running:

cherry_picker 1f984f3 v3-2-test

This should apply the commit to the v3-2-test branch and leave the commit in conflict state marking
the files that need manual conflict resolution.

After you have resolved the conflicts, you can continue the backport process by running:

cherry_picker --continue

If you don't have cherry-picker installed, see the installation guide.

…pache#65637) Squash- and rebase-merges both rewrite the commit SHAs from -test onto -stable, which means the subsequent rc tag points at a different commit than the release-prep PR that was reviewed and merged into -test. Fast-forward preserves the original SHAs so the tag, the testing-status issue, and the SVN source tarball all reference the same commit the contributors reviewed. Caught during 0.1.4rc3 prep — the initial sync PR was squash-merged and had to be redone as a fast-forward before tagging.

potiuk · 2026-04-21T21:59:00Z

Squash- and rebase-merges both rewrite the commit SHAs from `-test` onto `-stable`. That means the rc tag cut from `-stable` afterwards points at a different commit than the release-prep PR reviewed and merged into `-test` — so the tag, the testing-status issue, and the SVN source tarball all disagree on what the release manager actually reviewed.

Fast-forward preserves the original SHAs on `-stable` and makes it a clean extension of `-test`, which is what the rc tag + testing-status issue + SVN source tarball all need to agree on.

Caught while preparing airflow-ctl 0.1.4rc3 — the initial sync PR was squash-merged, which produced a new commit on `-stable` with a different SHA than the release-prep PR #65634 on `-test`. The sync was redone as a fast-forward before cutting the rc3 tag.

Branch protection on `airflow-ctl/vX-Y-stable` enforces `required_linear_history: true`, which already permits fast-forward, squash, and rebase — so INFRA will accept the fast-forward push as long as the sync PR was reviewed.

Test plan

N/A — doc-only change.

Was generative AI tooling used to co-author this PR?

Yes — Claude Opus 4.7 (1M context)

Generated-by: Claude Opus 4.7 (1M context) following the guidelines

Squash- and rebase-merges both rewrite the commit SHAs from -test onto -stable, which means the subsequent rc tag points at a different commit than the release-prep PR that was reviewed and merged into -test. Fast-forward preserves the original SHAs so the tag, the testing-status issue, and the SVN source tarball all reference the same commit the contributors reviewed. Caught during 0.1.4rc3 prep — the initial sync PR was squash-merged and had to be redone as a fast-forward before tagging.

github-actions · 2026-04-21T23:38:50Z

Backport failed to create: v3-2-test. View the failure log Run details

Note: As of Merging PRs targeted for Airflow 3.X
the committer who merges the PR is responsible for backporting the PRs that are bug fixes (generally speaking) to the maintenance branches.

In matter of doubt please ask in #release-management Slack channel.

Status	Branch	Result
❌	v3-2-test

You can attempt to backport this manually by running:

cherry_picker 1f984f3 v3-2-test

This should apply the commit to the v3-2-test branch and leave the commit in conflict state marking
the files that need manual conflict resolution.

After you have resolved the conflicts, you can continue the backport process by running:

cherry_picker --continue

If you don't have cherry-picker installed, see the installation guide.

…pache#65637) Squash- and rebase-merges both rewrite the commit SHAs from -test onto -stable, which means the subsequent rc tag points at a different commit than the release-prep PR that was reviewed and merged into -test. Fast-forward preserves the original SHAs so the tag, the testing-status issue, and the SVN source tarball all reference the same commit the contributors reviewed. Caught during 0.1.4rc3 prep — the initial sync PR was squash-merged and had to be redone as a fast-forward before tagging.

potiuk · 2026-04-21T21:59:00Z

Squash- and rebase-merges both rewrite the commit SHAs from `-test` onto `-stable`. That means the rc tag cut from `-stable` afterwards points at a different commit than the release-prep PR reviewed and merged into `-test` — so the tag, the testing-status issue, and the SVN source tarball all disagree on what the release manager actually reviewed.

Fast-forward preserves the original SHAs on `-stable` and makes it a clean extension of `-test`, which is what the rc tag + testing-status issue + SVN source tarball all need to agree on.

Caught while preparing airflow-ctl 0.1.4rc3 — the initial sync PR was squash-merged, which produced a new commit on `-stable` with a different SHA than the release-prep PR #65634 on `-test`. The sync was redone as a fast-forward before cutting the rc3 tag.

Branch protection on `airflow-ctl/vX-Y-stable` enforces `required_linear_history: true`, which already permits fast-forward, squash, and rebase — so INFRA will accept the fast-forward push as long as the sync PR was reviewed.

Test plan

N/A — doc-only change.

Was generative AI tooling used to co-author this PR?

Yes — Claude Opus 4.7 (1M context)

Generated-by: Claude Opus 4.7 (1M context) following the guidelines

Squash- and rebase-merges both rewrite the commit SHAs from -test onto -stable, which means the subsequent rc tag points at a different commit than the release-prep PR that was reviewed and merged into -test. Fast-forward preserves the original SHAs so the tag, the testing-status issue, and the SVN source tarball all reference the same commit the contributors reviewed. Caught during 0.1.4rc3 prep — the initial sync PR was squash-merged and had to be redone as a fast-forward before tagging.

github-actions · 2026-04-21T23:38:50Z

Backport failed to create: v3-2-test. View the failure log Run details

Note: As of Merging PRs targeted for Airflow 3.X
the committer who merges the PR is responsible for backporting the PRs that are bug fixes (generally speaking) to the maintenance branches.

In matter of doubt please ask in #release-management Slack channel.

Status	Branch	Result
❌	v3-2-test

You can attempt to backport this manually by running:

cherry_picker 1f984f3 v3-2-test

This should apply the commit to the v3-2-test branch and leave the commit in conflict state marking
the files that need manual conflict resolution.

After you have resolved the conflicts, you can continue the backport process by running:

cherry_picker --continue

If you don't have cherry-picker installed, see the installation guide.

…pache#65637) Squash- and rebase-merges both rewrite the commit SHAs from -test onto -stable, which means the subsequent rc tag points at a different commit than the release-prep PR that was reviewed and merged into -test. Fast-forward preserves the original SHAs so the tag, the testing-status issue, and the SVN source tarball all reference the same commit the contributors reviewed. Caught during 0.1.4rc3 prep — the initial sync PR was squash-merged and had to be redone as a fast-forward before tagging.

potiuk · 2026-04-21T21:59:00Z

Squash- and rebase-merges both rewrite the commit SHAs from `-test` onto `-stable`. That means the rc tag cut from `-stable` afterwards points at a different commit than the release-prep PR reviewed and merged into `-test` — so the tag, the testing-status issue, and the SVN source tarball all disagree on what the release manager actually reviewed.

Fast-forward preserves the original SHAs on `-stable` and makes it a clean extension of `-test`, which is what the rc tag + testing-status issue + SVN source tarball all need to agree on.

Caught while preparing airflow-ctl 0.1.4rc3 — the initial sync PR was squash-merged, which produced a new commit on `-stable` with a different SHA than the release-prep PR #65634 on `-test`. The sync was redone as a fast-forward before cutting the rc3 tag.

Branch protection on `airflow-ctl/vX-Y-stable` enforces `required_linear_history: true`, which already permits fast-forward, squash, and rebase — so INFRA will accept the fast-forward push as long as the sync PR was reviewed.

Test plan

N/A — doc-only change.

Was generative AI tooling used to co-author this PR?

Yes — Claude Opus 4.7 (1M context)

Generated-by: Claude Opus 4.7 (1M context) following the guidelines

Squash- and rebase-merges both rewrite the commit SHAs from -test onto -stable, which means the subsequent rc tag points at a different commit than the release-prep PR that was reviewed and merged into -test. Fast-forward preserves the original SHAs so the tag, the testing-status issue, and the SVN source tarball all reference the same commit the contributors reviewed. Caught during 0.1.4rc3 prep — the initial sync PR was squash-merged and had to be redone as a fast-forward before tagging.

github-actions · 2026-04-21T23:38:50Z

Backport failed to create: v3-2-test. View the failure log Run details

Note: As of Merging PRs targeted for Airflow 3.X
the committer who merges the PR is responsible for backporting the PRs that are bug fixes (generally speaking) to the maintenance branches.

In matter of doubt please ask in #release-management Slack channel.

Status	Branch	Result
❌	v3-2-test

You can attempt to backport this manually by running:

cherry_picker 1f984f3 v3-2-test

This should apply the commit to the v3-2-test branch and leave the commit in conflict state marking
the files that need manual conflict resolution.

After you have resolved the conflicts, you can continue the backport process by running:

cherry_picker --continue

If you don't have cherry-picker installed, see the installation guide.

…pache#65637) Squash- and rebase-merges both rewrite the commit SHAs from -test onto -stable, which means the subsequent rc tag points at a different commit than the release-prep PR that was reviewed and merged into -test. Fast-forward preserves the original SHAs so the tag, the testing-status issue, and the SVN source tarball all reference the same commit the contributors reviewed. Caught during 0.1.4rc3 prep — the initial sync PR was squash-merged and had to be redone as a fast-forward before tagging.

potiuk · 2026-04-21T21:59:00Z

Squash- and rebase-merges both rewrite the commit SHAs from `-test` onto `-stable`. That means the rc tag cut from `-stable` afterwards points at a different commit than the release-prep PR reviewed and merged into `-test` — so the tag, the testing-status issue, and the SVN source tarball all disagree on what the release manager actually reviewed.

Fast-forward preserves the original SHAs on `-stable` and makes it a clean extension of `-test`, which is what the rc tag + testing-status issue + SVN source tarball all need to agree on.

Caught while preparing airflow-ctl 0.1.4rc3 — the initial sync PR was squash-merged, which produced a new commit on `-stable` with a different SHA than the release-prep PR #65634 on `-test`. The sync was redone as a fast-forward before cutting the rc3 tag.

Branch protection on `airflow-ctl/vX-Y-stable` enforces `required_linear_history: true`, which already permits fast-forward, squash, and rebase — so INFRA will accept the fast-forward push as long as the sync PR was reviewed.

Test plan

N/A — doc-only change.

Was generative AI tooling used to co-author this PR?

Yes — Claude Opus 4.7 (1M context)

Generated-by: Claude Opus 4.7 (1M context) following the guidelines

Squash- and rebase-merges both rewrite the commit SHAs from -test onto -stable, which means the subsequent rc tag points at a different commit than the release-prep PR that was reviewed and merged into -test. Fast-forward preserves the original SHAs so the tag, the testing-status issue, and the SVN source tarball all reference the same commit the contributors reviewed. Caught during 0.1.4rc3 prep — the initial sync PR was squash-merged and had to be redone as a fast-forward before tagging.

github-actions · 2026-04-21T23:38:50Z

Backport failed to create: v3-2-test. View the failure log Run details

Note: As of Merging PRs targeted for Airflow 3.X
the committer who merges the PR is responsible for backporting the PRs that are bug fixes (generally speaking) to the maintenance branches.

In matter of doubt please ask in #release-management Slack channel.

Status	Branch	Result
❌	v3-2-test

You can attempt to backport this manually by running:

cherry_picker 1f984f3 v3-2-test

This should apply the commit to the v3-2-test branch and leave the commit in conflict state marking
the files that need manual conflict resolution.

After you have resolved the conflicts, you can continue the backport process by running:

cherry_picker --continue

If you don't have cherry-picker installed, see the installation guide.

…pache#65637) Squash- and rebase-merges both rewrite the commit SHAs from -test onto -stable, which means the subsequent rc tag points at a different commit than the release-prep PR that was reviewed and merged into -test. Fast-forward preserves the original SHAs so the tag, the testing-status issue, and the SVN source tarball all reference the same commit the contributors reviewed. Caught during 0.1.4rc3 prep — the initial sync PR was squash-merged and had to be redone as a fast-forward before tagging.

potiuk · 2026-04-21T21:59:00Z

Squash- and rebase-merges both rewrite the commit SHAs from `-test` onto `-stable`. That means the rc tag cut from `-stable` afterwards points at a different commit than the release-prep PR reviewed and merged into `-test` — so the tag, the testing-status issue, and the SVN source tarball all disagree on what the release manager actually reviewed.

Fast-forward preserves the original SHAs on `-stable` and makes it a clean extension of `-test`, which is what the rc tag + testing-status issue + SVN source tarball all need to agree on.

Caught while preparing airflow-ctl 0.1.4rc3 — the initial sync PR was squash-merged, which produced a new commit on `-stable` with a different SHA than the release-prep PR #65634 on `-test`. The sync was redone as a fast-forward before cutting the rc3 tag.

Branch protection on `airflow-ctl/vX-Y-stable` enforces `required_linear_history: true`, which already permits fast-forward, squash, and rebase — so INFRA will accept the fast-forward push as long as the sync PR was reviewed.

Test plan

N/A — doc-only change.

Was generative AI tooling used to co-author this PR?

Yes — Claude Opus 4.7 (1M context)

Generated-by: Claude Opus 4.7 (1M context) following the guidelines

Squash- and rebase-merges both rewrite the commit SHAs from -test onto -stable, which means the subsequent rc tag points at a different commit than the release-prep PR that was reviewed and merged into -test. Fast-forward preserves the original SHAs so the tag, the testing-status issue, and the SVN source tarball all reference the same commit the contributors reviewed. Caught during 0.1.4rc3 prep — the initial sync PR was squash-merged and had to be redone as a fast-forward before tagging.

github-actions · 2026-04-21T23:38:50Z

Backport failed to create: v3-2-test. View the failure log Run details

Note: As of Merging PRs targeted for Airflow 3.X
the committer who merges the PR is responsible for backporting the PRs that are bug fixes (generally speaking) to the maintenance branches.

In matter of doubt please ask in #release-management Slack channel.

Status	Branch	Result
❌	v3-2-test

You can attempt to backport this manually by running:

cherry_picker 1f984f3 v3-2-test

This should apply the commit to the v3-2-test branch and leave the commit in conflict state marking
the files that need manual conflict resolution.

After you have resolved the conflicts, you can continue the backport process by running:

cherry_picker --continue

If you don't have cherry-picker installed, see the installation guide.

…pache#65637) Squash- and rebase-merges both rewrite the commit SHAs from -test onto -stable, which means the subsequent rc tag points at a different commit than the release-prep PR that was reviewed and merged into -test. Fast-forward preserves the original SHAs so the tag, the testing-status issue, and the SVN source tarball all reference the same commit the contributors reviewed. Caught during 0.1.4rc3 prep — the initial sync PR was squash-merged and had to be redone as a fast-forward before tagging.

potiuk · 2026-04-21T21:59:00Z

Squash- and rebase-merges both rewrite the commit SHAs from `-test` onto `-stable`. That means the rc tag cut from `-stable` afterwards points at a different commit than the release-prep PR reviewed and merged into `-test` — so the tag, the testing-status issue, and the SVN source tarball all disagree on what the release manager actually reviewed.

Fast-forward preserves the original SHAs on `-stable` and makes it a clean extension of `-test`, which is what the rc tag + testing-status issue + SVN source tarball all need to agree on.

Caught while preparing airflow-ctl 0.1.4rc3 — the initial sync PR was squash-merged, which produced a new commit on `-stable` with a different SHA than the release-prep PR #65634 on `-test`. The sync was redone as a fast-forward before cutting the rc3 tag.

Branch protection on `airflow-ctl/vX-Y-stable` enforces `required_linear_history: true`, which already permits fast-forward, squash, and rebase — so INFRA will accept the fast-forward push as long as the sync PR was reviewed.

Test plan

N/A — doc-only change.

Was generative AI tooling used to co-author this PR?

Yes — Claude Opus 4.7 (1M context)

Generated-by: Claude Opus 4.7 (1M context) following the guidelines

Squash- and rebase-merges both rewrite the commit SHAs from -test onto -stable, which means the subsequent rc tag points at a different commit than the release-prep PR that was reviewed and merged into -test. Fast-forward preserves the original SHAs so the tag, the testing-status issue, and the SVN source tarball all reference the same commit the contributors reviewed. Caught during 0.1.4rc3 prep — the initial sync PR was squash-merged and had to be redone as a fast-forward before tagging.

github-actions · 2026-04-21T23:38:50Z

Backport failed to create: v3-2-test. View the failure log Run details

Note: As of Merging PRs targeted for Airflow 3.X
the committer who merges the PR is responsible for backporting the PRs that are bug fixes (generally speaking) to the maintenance branches.

In matter of doubt please ask in #release-management Slack channel.

Status	Branch	Result
❌	v3-2-test

You can attempt to backport this manually by running:

cherry_picker 1f984f3 v3-2-test

This should apply the commit to the v3-2-test branch and leave the commit in conflict state marking
the files that need manual conflict resolution.

After you have resolved the conflicts, you can continue the backport process by running:

cherry_picker --continue

If you don't have cherry-picker installed, see the installation guide.

…pache#65637) Squash- and rebase-merges both rewrite the commit SHAs from -test onto -stable, which means the subsequent rc tag points at a different commit than the release-prep PR that was reviewed and merged into -test. Fast-forward preserves the original SHAs so the tag, the testing-status issue, and the SVN source tarball all reference the same commit the contributors reviewed. Caught during 0.1.4rc3 prep — the initial sync PR was squash-merged and had to be redone as a fast-forward before tagging.

potiuk requested review from bugraoz93, jedcunningham, jscheffl, shahar1 and vincbeck as code owners April 21, 2026 21:59

boring-cyborgBot added area:dev-tools backport-to-v3-2-test labels Apr 21, 2026

bugraoz93 approved these changes Apr 21, 2026
View reviewed changes

potiuk merged commit 1f984f3 into apache:mainApr 21, 2026
63 checks passed

potiuk deleted the fix-airflow-ctl-release-sync-fast-forward branch April 21, 2026 23:37