release: changes to prepare/changelog/finalize#27551
Open
Conversation
gulducat
added
theme/ci
backport/ent/1.8.x+ent
big ticket items:
* enable finalize script to push (squashed) changes to main branch
* move "LAST_RELEASE" value to scripts/release/previous.version
* a follow-up will remove LAST_RELEASE from GNUmakefile
* stop changing the slack channel; just use what's in .release/ci.hcl
minutia:
* main-branch input allows for testing "finalize" to non-main branch
* move `git commit` and `git push` out of scripts
* the workflow does this at the end instead,
to make a single commit with generated files and changelog
* ALLOW_DIRTY_WORKTREE env skips that check,
while still protecting human users from messing up their local git
* new branch prefix is detected dynamically based on source branch
* still only needed for testing, to use non-"release/" prefix
* tighten some script output
* consistent double"quotes" in yaml
gulducat
force-pushed
the
ci-release-workflow-changes
branch
from
313883f to
e8d9c87
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
1 participant
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.
Assorted changes to new release workflows and scripts, initially set up in #27339.
Some of the diffs are kinda gnarly, but the scripts are not very long if you wanna just read em from the top.
Changes:
Big ticket items:
Minutia:
git commitandgit pushout of scriptsOverall process:
preparecreates1.11.99+entfrom1.11.x+ent, cuts a changelog, updates version, and generates files.finalizemerges the commit from.99into.xand makes the "prepare for next release" commitfinalizemainsquashes those two commits now in.xinto one to push tomainHere's a truncated example of it running successfully (in private nomad-releases repo):
Example
finalizefailure due to merge conflict (to show debuggability):Jira: https://hashicorp.atlassian.net/browse/NMD-1109