fix: use consistent patch increment for terraform release tags - #488
Merged
Conversation
Previously, branch-based releases computed the patch number by counting commits touching the terraform path since diverging from main, while explicit-track releases incremented from the highest existing tag. This diverged when the terraform directory was renamed, causing tag creation to fail with 'tag already exists'. Both paths now derive the patch number the same way: highest existing tag's patch + 1, which is robust to directory renames and branch topology.
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.
Summary
Branch-based Terraform releases computed the tag's patch number by counting commits touching the terraform path since diverging from main, while explicit-track releases incremented from the highest existing tag's patch. These two approaches diverge whenever the terraform directory is renamed or moved, since commit counting doesn't follow renames. This caused tag creation to fail with "tag already exists" in catalogue-k8s-operator after its terraform module was moved into the charm folder.
Changes
tf-<major>.<minor>.*tag's patch + 1 (or 0 if none exists)git rev-list --count/git merge-baselogic, which is no longer needed