From c13436cbe543f1bdb9f9d0074a57a5fee7b71afd Mon Sep 17 00:00:00 2001 From: William Storey Date: Mon, 19 Jan 2026 08:51:04 -0800 Subject: [PATCH 01/11] Bump copyright date --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 49b914c..0eba707 100644 --- a/README.md +++ b/README.md @@ -360,7 +360,7 @@ This library uses [Semantic Versioning](https://semver.org/). ## Copyright and License -This software is Copyright (c) 2020-2025 by MaxMind, Inc. +This software is Copyright (c) 2020-2026 by MaxMind, Inc. This is free software, licensed under the [Apache License, Version 2.0](LICENSE-APACHE) or the [MIT License](LICENSE-MIT), at your option. From 6b372ca105be2e90dd15232f3f7b47ac6afcd1ff Mon Sep 17 00:00:00 2001 From: William Storey Date: Mon, 19 Jan 2026 08:53:31 -0800 Subject: [PATCH 02/11] Add connection_pool update to changelog --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index da890fa..c5a327f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,8 @@ * Unnecessary files were removed from the published .gem. Pull request by Orien Madgwick. GitHub #131. +* Updated `connection_pool` dependency to allow version 3+. Reported by + Igor Kasyanchuk. GitHub #140. ## 1.4.0 (2025-11-20) From b4b166acc9f2ccd15be6f46f4df6f28c625942bf Mon Sep 17 00:00:00 2001 From: William Storey Date: Mon, 19 Jan 2026 08:54:44 -0800 Subject: [PATCH 03/11] Set release date --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c5a327f..3402a4d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Changelog -## 1.5.0 +## 1.5.0 (2026-01-19) * Unnecessary files were removed from the published .gem. Pull request by Orien Madgwick. GitHub #131. From 44032be26cc97a51ed0bd3d05786a30946ef666f Mon Sep 17 00:00:00 2001 From: William Storey Date: Mon, 19 Jan 2026 09:00:16 -0800 Subject: [PATCH 04/11] Update for v1.5.0 --- lib/maxmind/geoip2/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/maxmind/geoip2/version.rb b/lib/maxmind/geoip2/version.rb index 01a4a01..1af3387 100644 --- a/lib/maxmind/geoip2/version.rb +++ b/lib/maxmind/geoip2/version.rb @@ -3,6 +3,6 @@ module MaxMind module GeoIP2 # The Gem version. - VERSION = '1.4.0' + VERSION = '1.5.0' end end From 4fe6aacaadee752bd712179f207c4eec0253d51e Mon Sep 17 00:00:00 2001 From: William Storey Date: Mon, 19 Jan 2026 09:10:22 -0800 Subject: [PATCH 05/11] Update Gemfile.lock during release too --- dev-bin/release.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dev-bin/release.sh b/dev-bin/release.sh index d2ee600..3a4cd7e 100755 --- a/dev-bin/release.sh +++ b/dev-bin/release.sh @@ -84,6 +84,9 @@ fi perl -pi -e "s/(?<=VERSION = \').+?(?=\')/$version/g" lib/maxmind/geoip2/version.rb +# Update version in Gemfile.lock. +bundle install + echo $"Test results:" rake From 7d0e7221f6b24332a0205609e4c47d780c635e97 Mon Sep 17 00:00:00 2001 From: William Storey Date: Mon, 19 Jan 2026 09:21:13 -0800 Subject: [PATCH 06/11] Bump to 1.5.0 in Gemfile.lock --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index e77ef58..ceb8038 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: . specs: - maxmind-geoip2 (1.4.0) + maxmind-geoip2 (1.5.0) connection_pool (>= 2.2, < 4.0) http (>= 4.3, < 6.0) maxmind-db (~> 1.4) From 5a890ab5679198ca5fd558b183667d4ffa25e401 Mon Sep 17 00:00:00 2001 From: William Storey Date: Mon, 19 Jan 2026 09:21:58 -0800 Subject: [PATCH 07/11] Add 1.5.1 to changelog and set release date --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3402a4d..93aa2c3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # Changelog +## 1.5.1 (2026-01-19) + +* Re-release with a fix to the release process. This includes a bump of the + gem's version in `Gemfile.lock`. + ## 1.5.0 (2026-01-19) * Unnecessary files were removed from the published .gem. Pull request by From 4f7fc47010e85e23303992563ee99e8d7664c391 Mon Sep 17 00:00:00 2001 From: William Storey Date: Mon, 19 Jan 2026 09:22:29 -0800 Subject: [PATCH 08/11] Update for v1.5.1 --- Gemfile.lock | 2 +- lib/maxmind/geoip2/version.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index ceb8038..ac2712d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: . specs: - maxmind-geoip2 (1.5.0) + maxmind-geoip2 (1.5.1) connection_pool (>= 2.2, < 4.0) http (>= 4.3, < 6.0) maxmind-db (~> 1.4) diff --git a/lib/maxmind/geoip2/version.rb b/lib/maxmind/geoip2/version.rb index 1af3387..4dc484a 100644 --- a/lib/maxmind/geoip2/version.rb +++ b/lib/maxmind/geoip2/version.rb @@ -3,6 +3,6 @@ module MaxMind module GeoIP2 # The Gem version. - VERSION = '1.5.0' + VERSION = '1.5.1' end end From 9178fe7a9aa67d9e75ff344d2097a409fb59f617 Mon Sep 17 00:00:00 2001 From: William Storey Date: Mon, 19 Jan 2026 09:28:35 -0800 Subject: [PATCH 09/11] Check for bundle command --- dev-bin/release.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/dev-bin/release.sh b/dev-bin/release.sh index 3a4cd7e..ba1e5db 100755 --- a/dev-bin/release.sh +++ b/dev-bin/release.sh @@ -32,6 +32,7 @@ fi check_command perl check_command rake +check_command bundle # Check that we're not on the main branch current_branch=$(git branch --show-current) From 4194c15cfe92593550efd295c70ef6043f2374c5 Mon Sep 17 00:00:00 2001 From: William Storey Date: Mon, 19 Jan 2026 09:40:54 -0800 Subject: [PATCH 10/11] Use frozen mode for bundle install in CI This ensures CI fails immediately with a clear error if Gemfile.lock is out of sync, rather than silently updating it. Co-Authored-By: Claude Opus 4.5 --- .github/workflows/release.yml | 2 ++ .github/workflows/rubocop.yml | 2 ++ .github/workflows/test.yml | 2 ++ 3 files changed, 6 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f3b8cbe..748592d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -31,6 +31,8 @@ jobs: ruby-version: ruby - run: bundle install + env: + BUNDLE_FROZEN: true # zizmor complains that 'v1' is a ref that can be provided by both the branch and tag namespaces. # specify that we want the v1 branch. diff --git a/.github/workflows/rubocop.yml b/.github/workflows/rubocop.yml index 5437892..5fc8621 100644 --- a/.github/workflows/rubocop.yml +++ b/.github/workflows/rubocop.yml @@ -23,4 +23,6 @@ jobs: ruby-version: 3.4 - run: bundle install + env: + BUNDLE_FROZEN: true - run: bundle exec rake -t rubocop diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 0c04aec..ba40976 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -38,4 +38,6 @@ jobs: ruby-version: ${{ matrix.version }} - run: bundle install + env: + BUNDLE_FROZEN: true - run: bundle exec rake -t test From 516eb01c5cfce890adfd2012847b6fd83bf3c441 Mon Sep 17 00:00:00 2001 From: William Storey Date: Mon, 19 Jan 2026 09:57:44 -0800 Subject: [PATCH 11/11] Add java platform to Gemfile.lock for JRuby support This fixes JRuby CI builds which were failing with BUNDLE_FROZEN=true because the lockfile lacked JRuby-compatible gem variants. Co-Authored-By: Claude Opus 4.5 --- Gemfile.lock | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Gemfile.lock b/Gemfile.lock index ac2712d..96c88c2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -13,6 +13,7 @@ GEM public_suffix (>= 2.0.2, < 8.0) ast (2.4.3) bigdecimal (3.3.1) + bigdecimal (3.3.1-java) connection_pool (3.0.2) crack (1.0.1) bigdecimal @@ -24,6 +25,7 @@ GEM ffi (1.17.2-arm-linux-gnu) ffi (1.17.2-arm-linux-musl) ffi (1.17.2-arm64-darwin) + ffi (1.17.2-java) ffi (1.17.2-x86-linux-gnu) ffi (1.17.2-x86-linux-musl) ffi (1.17.2-x86_64-darwin) @@ -42,6 +44,7 @@ GEM domain_name (~> 0.5) http-form_data (2.3.0) json (2.18.0) + json (2.18.0-java) language_server-protocol (3.17.0.5) lint_roller (1.1.0) llhttp-ffi (0.5.1) @@ -57,6 +60,7 @@ GEM prism (1.7.0) public_suffix (7.0.0) racc (1.8.1) + racc (1.8.1-java) rainbow (3.1.1) rake (13.3.1) regexp_parser (2.11.3) @@ -105,6 +109,7 @@ PLATFORMS arm-linux-gnu arm-linux-musl arm64-darwin + java ruby x86-linux-gnu x86-linux-musl