Skip to content

fix(release): read the version after checking out the base #192

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
anoop-narang merged 3 commits into from
Sep 10, 2026
Merged

fix(release): read the version after checking out the base #192

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9880516
fix(release): read the version after checking out the base
anoop-narang Sep 10, 2026
1c4e545
fix(release): validate the bump kind before switching branches
anoop-narang Sep 10, 2026
f162571
refactor(release): one definition of the version pattern
anoop-narang Sep 10, 2026
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
28 changes: 21 additions & 7 deletions scripts/release.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,11 @@ ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
cd "$ROOT"

die() { echo "error: $*" >&2; exit 1; }

# The one definition of an explicit version, shared by the argument check and
# the branch that takes the argument verbatim, so the two cannot drift apart.
readonly VERSION_RE='^[0-9]+\.[0-9]+\.[0-9]+$'
readonly BUMP_KIND_RE='^(patch|minor|major)$'
need() { command -v "$1" >/dev/null 2>&1 || die "$1 is required"; }

# An interpreter that can `import tomllib`, which is stdlib only from 3.11.
Expand Down Expand Up @@ -135,25 +140,34 @@ update_changelog() {
cmd_prepare() {
local bump="${1:-}"
[[ -n "$bump" ]] || { usage; die "missing bump kind or explicit version"; }
# Check the argument before any branch switch below, so a typo exits without
# moving the caller off the branch they invoked from. Failures that depend on
# the base branch's version — an unchanged version, a pre-release suffix —
# can only be found after the checkout.
[[ "$bump" =~ $BUMP_KIND_RE || "$bump" =~ $VERSION_RE ]] \
|| { usage; die "unknown bump kind: $bump"; }
need gh
PY_BIN="$(resolve_python)"
ensure_clean

local current new base branch pkg
base="$(default_branch)"
git fetch origin "$base"
git checkout "$base"
git pull --ff-only origin "$base"
ensure_clean

# Read the version from the base branch, not from whatever branch the script
# was invoked on. The bump is computed from it, so reading it first numbers
# the release off unrelated history.
current="$(get_version)"
if [[ "$bump" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
if [[ "$bump" =~ $VERSION_RE ]]; then
new="$bump"
else
new="$(bump_version "$bump" "$current")"
fi
[[ "$new" != "$current" ]] || die "new version ($new) equals current ($current)"
Comment thread
anoop-narang marked this conversation as resolved.

base="$(default_branch)"
git fetch origin "$base"
git checkout "$base"
git pull --ff-only origin "$base"
ensure_clean

set_version "$new"
update_changelog "$new"
if command -v uv >/dev/null 2>&1 && [[ -f uv.lock ]]; then
Expand Down