From b016a48eeac61d4a5961ea81a3e24eb036d4d869 Mon Sep 17 00:00:00 2001 From: Gregory Oschwald Date: Mon, 29 Jun 2026 11:58:47 -0700 Subject: [PATCH 1/3] Set release date --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a8011e10..7c909810 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,7 @@ CHANGELOG ========= -7.0.0 (unreleased) +7.0.0 (2026-06-29) ------------------ * **Breaking** Dropped support for Node.js 18 and 20. Node.js 22 or greater is now From 5b00e8f7a5c2dc91c8a077f4346e19dc50989590 Mon Sep 17 00:00:00 2001 From: Gregory Oschwald Date: Mon, 29 Jun 2026 12:14:12 -0700 Subject: [PATCH 2/3] Update copyright year --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d834ecdd..2b9a74ce 100644 --- a/README.md +++ b/README.md @@ -420,6 +420,6 @@ client API, please contact [MaxMind support for assistance](https://support.maxm ## Copyright and License -This software is Copyright (c) 2018-2025 by MaxMind, Inc. +This software is Copyright (c) 2018-2026 by MaxMind, Inc. This is free software, licensed under the Apache License, Version 2.0. From 82493c474d21db34bfe08845f2947c38e6f67792 Mon Sep 17 00:00:00 2001 From: Gregory Oschwald Date: Mon, 29 Jun 2026 12:48:04 -0700 Subject: [PATCH 3/3] Make release script tolerate an already-bumped package.json If the version bump was already committed on the release branch, the working tree is clean, npm version is skipped, and the unconditional git commit died with "nothing to commit" under set -e. Verify package.json is at the target version after the update block (catching a genuinely failed replacement), then only commit when there are changes to commit. Co-Authored-By: Claude Opus 4.8 (1M context) --- dev-bin/release.sh | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/dev-bin/release.sh b/dev-bin/release.sh index f7a30046..ba5893b6 100755 --- a/dev-bin/release.sh +++ b/dev-bin/release.sh @@ -91,6 +91,15 @@ if [ "$current_version" != "$version" ]; then npm version "$version" --no-git-tag-version fi +# Verify package.json is now at the target version. This distinguishes the +# benign "already bumped" case (nothing to commit) from a version update that +# silently failed to take effect. +actual_version=$(node -p "require('./package.json').version") +if [ "$actual_version" != "$version" ]; then + echo "Error: package.json version is $actual_version but expected $version." >&2 + exit 1 +fi + # Build and test echo "Running build and tests..." npm ci @@ -111,7 +120,11 @@ if [ "$should_continue" != "y" ]; then exit 1 fi -git commit -m "Prepare for $version" -a +if [ -n "$(git status --porcelain)" ]; then + git commit -m "Prepare for $version" -a +else + echo "No changes to commit; package.json is already at version $version." +fi git push