Repository navigation
fix(ci): use the previous master tip as base, and wait for its run before retagging (#1549) - #1947
Merged
Merged
Conversation
…n before retagging (#1549) Detection and Stage 5B now share one base: github.event.before, falling back to HEAD^1 for dispatch, branch creation and force-push. A new job waits until the base commit's runs are finished, so rapid merges no longer fail Stage 5B on tags that are not pushed yet.
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.
Refs #1549
What
github.event.before(the tip before the push), notHEAD^1.scripts/ci/master-base-ref.shfalls back toHEAD^1forworkflow_dispatch, the null SHA (branch creation), a commit not in the clone, or a force-push. Detect Changes exports this asbase_ref, and Stage 5B uses the same value instead ofgit rev-parse HEAD^.wait-for-base-run(it starts after this run's own builds and tests) waits (up to 55 min) until everyci-unified.ymlrun of the base commit has finished. Stage 5B needs it, so it reads the base's final SHA tags instead of failing while the base run is still going. It never fails itself; 5B still checks the tags and fails loudly when they are missing.Decision: a waiting retag step, not queue-by-branch concurrency
ci-master+cancel-in-progress: false) keeps only one pending run; GitHub cancels the older pending ones. A cancelled run tags nothing, so its commit is never deployable, and its successor again finds no base images. That breaks the chain in the same case it should fix.force_rebuild=truerepairs. Large batches should still go one at a time.:latestis added: the reasons in.github/workflows/CLAUDE.md("Stage 5B sources ONLY the base commit's SHA tag") still hold.Tests
scripts/tests/master-base-ref.bats(runs in Deployment Scripts Tests): a two-commit push with the change in the first commit, a single commit, emptybefore, null SHA, force-push, and an unknown SHA.Progress
github.event.before, with theHEAD^1fallbacks.github/workflows/CLAUDE.md)