From 8f8004c205e5036f1ca77daaeef9666fb56e5f95 Mon Sep 17 00:00:00 2001 From: Ansho Rei Date: Wed, 4 Nov 2026 09:24:54 +0100 Subject: [PATCH] build: bump versions only on local master A bump amends and tags the last commit, so made on a feature branch it tags a commit that master may never contain. The targets now refuse any branch but master, and a detached HEAD. --- Makefile | 13 ++++++++++--- README.md | 1 + 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index afcdfc9..951e110 100644 --- a/Makefile +++ b/Makefile @@ -113,6 +113,8 @@ branding: ## Regenerate the logo SVGs and render the PNGs (needs inkscape) PACKAGE = $(shell awk -F'"' '/^\[package\]/{p=1;next} /^\[/{p=0} p && /^name *= *"/{print $$2; exit}' Cargo.toml) CURRENT = $(shell awk -F'"' '/^\[package\]/{p=1;next} /^\[/{p=0} p && /^version *= *"/{print $$2; exit}' Cargo.toml) METAINFO = flatpak/$(FLATPAK_ID).metainfo.xml +# Versions are only made here, so a tag never lands on a commit that is not on it. +BUMP_BRANCH = master .PHONY: version version: ## Print the current version @@ -128,13 +130,18 @@ minor: bump ## Bump for a feature: amend into the last commit and tag it major: bump ## Bump for a breaking change, decided by hand # Folds the bump into the last commit and tags it, as one action, so there is -# never a bump without a tag or a tag without a bump. Refuses anything that -# would make rewriting that commit lose work, orphan a tag or need a force push, -# and a version CHANGELOG.md does not describe yet. +# never a bump without a tag or a tag without a bump. Refuses any branch but +# BUMP_BRANCH, anything that would make rewriting that commit lose work, orphan +# a tag or need a force push, and a version CHANGELOG.md does not describe yet. .PHONY: bump bump: @set -e; \ if [ -z "$(BUMP)" ]; then echo "error: run make patch, make minor or make major" >&2; exit 1; fi; \ + branch=$$(git symbolic-ref --quiet --short HEAD || true); \ + if [ "$$branch" != "$(BUMP_BRANCH)" ]; then \ + echo "error: versions are only bumped on local $(BUMP_BRANCH), and this is $${branch:-a detached HEAD}. Fast-forward $(BUMP_BRANCH) to this work, switch to it, then bump." >&2; \ + exit 1; \ + fi; \ if ! git rev-parse -q --verify HEAD >/dev/null 2>&1; then \ echo "error: no commits yet, so there is no commit to fold a version bump into. Commit first." >&2; \ exit 1; \ diff --git a/README.md b/README.md index 7c43725..be57583 100644 --- a/README.md +++ b/README.md @@ -90,4 +90,5 @@ Every finished ticket bumps the version, so a build on the Deck can be matched t - `make patch` for a bug fix, `make minor` for a feature, `make major` only when a breaking change has been decided. - Before bumping, add a `## v ()` entry at the top of `CHANGELOG.md`, with `### Features` and `### Bug fixes` subsections (leave out an empty one), and commit it with the change. `make version` prints the current version. +- Bump on local `master` only: fast-forward `master` to the finished work, switch to it, then bump. The targets refuse any other branch. - The bump writes the new version to `Cargo.toml`, `Cargo.lock` and the Flatpak metainfo, amends that into the last commit and tags it `v`. It refuses a dirty tree, a commit that is already tagged or pushed, and a version the changelog has no entry for.