Repository navigation
release: Make the tag step safe to retry in both release files - #1486
Open
marcleblanc2 wants to merge 1 commit into
Open
marcleblanc2 wants to merge 1 commit into
marcleblanc2 wants to merge 1 commit into
Conversation
1 task done
marcleblanc2
force-pushed
the
marc/batch-change-release-tag-retry
branch
from
November 11, 2026 22:23
bac89db to
2f8ec5f
Compare
marcleblanc2
changed the title
1 task done
marcleblanc2
force-pushed
the
marc/batch-change-release-tag-retry
branch
from
November 11, 2026 23:45
2f8ec5f to
3c9eca2
Compare
marcleblanc2
force-pushed
the
marc/batch-change-release-tag-retry
branch
from
November 12, 2026 22:27
3c9eca2 to
0bb72cc
Compare
marcleblanc2
changed the base branch from
marc/db-only-migrate-three-databases
to
marc/skip-smoke-test-on-docs-only
November 12, 2026 22:27
marcleblanc2
force-pushed
the
marc/batch-change-release-tag-retry
branch
from
November 12, 2026 22:56
0bb72cc to
2cee007
Compare
marcleblanc2
changed the base branch from
marc/skip-smoke-test-on-docs-only
to
main
November 13, 2026 04:58
marcleblanc2
force-pushed
the
marc/batch-change-release-tag-retry
branch
from
November 13, 2026 04:58
2cee007 to
741cdc5
Compare
marcleblanc2
changed the base branch from
main
to
marc/skip-smoke-test-on-docs-only
November 13, 2026 04:58
marcleblanc2
marked this pull request as ready for review
November 13, 2026 05:36
marcleblanc2
enabled stacked auto-merge (squash)
November 13, 2026 05:40
stacked auto-merge was automatically disabled
November 13, 2026 07:29
Auto-merge was disabled for another pull request in the stack
marcleblanc2
force-pushed
the
marc/batch-change-release-tag-retry
branch
from
November 13, 2026 07:40
741cdc5 to
dca57d7
Compare
Copies the tag step from release.yaml (#1449) to batch-change/release.yaml: keep a tag which already points at the promote commit, and fail if it points anywhere else. Both files now create the release branch with git switch -C, so a retry in a checkout which kept the branch from the first attempt no longer fails. Amp-Thread-ID: https://ampcode.com/threads/T-01a1c7a5-6b65-723b-980c-b85e1e9008b5 Co-authored-by: Amp <amp@ampcode.com>
marcleblanc2
force-pushed
the
marc/batch-change-release-tag-retry
branch
from
November 13, 2026 07:51
dca57d7 to
93654b4
Compare
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.
#1449 made the tag step in
release.yamlsafe to retry.batch-change/release.yamlhas the same step, and still runs a baregit tag, which fails when a finalize job is retried.release.yaml: if the tag already points at the promote commit, keep it; if it points anywhere else, fail.git switch -Cinstead of-c, which failed when a retry ran in a checkout that kept the branch from the first attempt.Risk: low. The first run of a release does what it did before. Only a retried finalize job behaves differently.
Checklist
Test plan
Ran the tag step from each file against a local Git remote, with the version set to
v9.9.9:main,batch-change/release.yamlmain,release.yamltag 'v9.9.9' already existsa branch named 'release-v9.9.9' already existstag 'v9.9.9' already existssg release; the next release is the first real runCloses FE-583