Skip to content

fix: use consistent patch increment for terraform release tags #488

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lucabello merged 1 commit into from
Aug 21, 2026
Merged

fix: use consistent patch increment for terraform release tags #488

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 13 additions & 19 deletions .github/workflows/terraform-release.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,29 +116,23 @@ jobs:
TAG_PREFIX: ${{ inputs.terraform-tag-prefix }}
TAG_SUFFIX: ${{ inputs.terraform-tag-suffix }}
TRACK_VERSION: ${{ steps.validate-branch.outputs.track_version }}
EXPLICIT_TRACK: ${{ inputs.track }}
GH_TOKEN: ${{ secrets.OBSERVABILITY_NOCTUA_TOKEN }}
run: |
track_version="$TRACK_VERSION"
if [[ -n "$EXPLICIT_TRACK" ]]; then
# Patch derived from existing tags: (highest existing patch) + 1, or 0 if none.
# This is robust regardless of branch topology (e.g. running from main).
tag_pattern="${TAG_PREFIX}${track_version}.*${TAG_SUFFIX}"
latest_tag=$(git tag --list "$tag_pattern" --sort=-version:refname | head -n1)
if [ -z "$latest_tag" ]; then
patch=0
else
# Strip prefix and suffix to isolate '<major>.<minor>.<patch>', then take the patch.
version="${latest_tag#"$TAG_PREFIX"}"
version="${version%"$TAG_SUFFIX"}"
last_patch="${version##*.}"
patch=$((last_patch + 1))
fi
# Patch derived from existing tags: (highest existing patch) + 1, or 0 if none.
# This is used for both explicit-track and branch-based releases so the
# tag's patch number is always consistent with what's already been
# published, regardless of branch topology or path renames.
tag_pattern="${TAG_PREFIX}${track_version}.*${TAG_SUFFIX}"
latest_tag=$(git tag --list "$tag_pattern" --sort=-version:refname | head -n1)
if [ -z "$latest_tag" ]; then
patch=0
else
# Branch-based: patch = commits on this track branch touching terraform/ since diverging from main.
git fetch origin main
merge_base=$(git merge-base HEAD origin/main)
patch=$(git rev-list --count "$merge_base"..HEAD -- "$TERRAFORM_PATH/")
# Strip prefix and suffix to isolate '<major>.<minor>.<patch>', then take the patch.
version="${latest_tag#"$TAG_PREFIX"}"
version="${version%"$TAG_SUFFIX"}"
last_patch="${version##*.}"
patch=$((last_patch + 1))
fi
# Build the tag
tag="${TAG_PREFIX}${track_version}.${patch}${TAG_SUFFIX}"
Expand Down