[CI/Packaging] Keep publication-pinned commits reachable after merge - #1080
Merged
Conversation
Teach Prepare merge and post-merge activation one bounded merge-commit history shape. A preserve-head-commit candidate accepts only the exact prepared base and reviewed PR head as its ordered parents and still requires the tested tree byte-for-byte. This lets publication workflows pin an exact reviewed SHA without leaving canonical package activation incompatible with the merge that keeps that SHA reachable. Conflicting history labels fail before candidate creation.
Contributor
|
prepare-merge: runtime/materialization tests passed against the synthetic PR merge; package staging and durable package publishing were skipped. |
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.
Why
Some packaging releases must keep one exact reviewed pull-request commit reachable after the pull request merges. For example, the ABI 42 Homebrew publisher and bottle catalog are pinned to one exact commit. A squash or rebase merge rewrites that identity, but the current merge-candidate activation protocol rejects merge commits. That would leave us with a bad choice: lose the pinned commit or merge successfully and then fail the canonical package activation.
This adds one narrow, fail-closed merge mode for that situation. It does not change the default: ordinary pull requests still squash, and
batched-changespull requests still rebase.What changed
preserve-head-commithistory mode to Prepare merge.batched-changesandpreserve-head-commitbefore creating a candidate.Validation
bash scripts/dev-shell.sh bash .github/scripts/test-verify-merge-candidate.shbash scripts/dev-shell.sh bash .github/scripts/test-init-merge-candidate.shbash scripts/dev-shell.sh bash .github/scripts/test-merge-candidate-workflows.shbash scripts/dev-shell.sh ruby -e 'require "yaml"; YAML.parse_file(".github/workflows/prepare-merge.yml")'bash -nfor every changed shell scriptgit diff --checkAll listed checks passed.
actionlintwas not run because it is not declared in the repository dev shell; the repository's merge-candidate workflow contract suite and a YAML parse were run instead.Scope
This changes CI/package-release history validation only. It does not change the kernel, ABI, runtime behavior, package bytes, or the frozen head of PR #1079.