[Backport M66] chore/build: Teach JetBrains push-git-tag-for-next-release.sh about release branches #6884
+88
−82
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.
These scripts predate release branches and used to always look at global tags. This change makes it work on release branches. It uses git to list the commits on the release branch, then does the same version bump calculation using the branch's tags.
It takes care to handle newly budding branches which are just a commit on
main
that has no backports yet. In that case it looks at all of the available tags.It will work carrying a branch from prerelease through to release:
There are some caveats with this tool:
If you ever need to work around this tool, just author and push git tags yourself. To this point release captains have been doing that anyway.
Adds a
--dry-run
option which makes testing easier. Removes outdated docs and points to Notion instead.Test plan
I am the release captain and will dogfood this script in the current release.
Backport b912145 from #6881