Skip to content

Fixed release tag landing on wrong commit and wrong version number (#47) #49

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
oleg68 merged 1 commit into from
Apr 15, 2026
Merged

Fixed release tag landing on wrong commit and wrong version number (#47) #49

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
17 changes: 14 additions & 3 deletions build-scripts/autotag.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,16 +69,27 @@ if [[ "$CHANGELOG_MM" == "$MM" ]]; then
git commit -m "Released ${RELEASE_TAG}"
git push origin HEAD
else
# Fresh release signal: create new release tag
# Fresh release signal: create new release tag.
# +1 because we are about to add the CHANGELOG commit on top of HEAD,
# and the tag must land on that commit so its name matches the commit count.
if [[ -n "$RELEASE_TAG" ]]; then
START_PATCH=$(echo "$RELEASE_TAG" | cut -d. -f3)
N=$(git rev-list "${RELEASE_TAG}..HEAD" --count)
FULL_VER="${MM}.$((START_PATCH + N + 1))"
else
N=$(git rev-list "${BASE_TAG}..HEAD" --count)
FULL_VER="${MM}.$((N + 1))"
fi
echo "Release signal: creating tag $FULL_VER"
sed '0,/^#/d;/^#/Q' "$CHANGELOG" > "$RELEASE_NOTES" || echo "Release $FULL_VER" > "$RELEASE_NOTES"
git tag "$FULL_VER"
git push origin "$FULL_VER"

# Auto-edit CHANGELOG: replace "# MM (date)" with "# FULL_VER (date)" to clear the release signal
sed -i "s|^# ${MM_ESCAPED} |# ${FULL_VER} |" "$CHANGELOG"
git add "$CHANGELOG"
git commit -m "Released ${FULL_VER}"
# Tag the CHANGELOG commit so "git tag --points-at HEAD" finds it in Calculate version
git tag "$FULL_VER"
git push origin HEAD
git push origin "$FULL_VER"
fi
fi
Loading