Skip to content

publish: don't abort tagging when the version was already committed #47

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
dbose merged 1 commit into from
Sep 27, 2026
Merged

publish: don't abort tagging when the version was already committed #47

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
27 changes: 24 additions & 3 deletions scripts/publish.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,27 @@ UV_PUBLISH_USERNAME=__token__ UV_PUBLISH_PASSWORD="$TOKEN" uv publish dist/*
# Only tag once the upload succeeded, so a failed publish leaves no tag behind.
echo "==> committing and tagging v$VERSION"
git add pyproject.toml uv.lock packages/server/src/mdl_server/static
git commit -m "Release $VERSION"
git tag "v$VERSION"
git push && git push --tags

# Commit the version bump ONLY if it isn't already committed. When the bump landed
# via a merged PR (the common case), the tree is clean here and `git commit` would
# abort the whole script under `set -e`, skipping the tag/push below — the exact bug
# that left v0.6.10 published but untagged. `git diff --cached --quiet` is 0 when there
# is nothing staged, so we commit only when there IS.
if git diff --cached --quiet; then
echo " version $VERSION already committed; tagging the current commit"
else
git commit -m "Release $VERSION"
fi

# Tag the commit that actually carries this version (HEAD now does, either way).
# Skip if the tag already exists (a re-run after a partial publish) so it never aborts.
if git rev-parse -q --verify "refs/tags/v$VERSION" >/dev/null; then
echo " tag v$VERSION already exists; leaving it in place"
else
git tag "v$VERSION"
fi

# Push the current branch and the tag. Pushing the tag is what release consumers rely
# on, so do it even when the branch push is a no-op (already up to date).
git push
git push origin "v$VERSION"
Loading