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 diff --git a/CHANGELOG.md b/CHANGELOG.md index da890fa..93aa2c3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,9 +1,16 @@ # Changelog -## 1.5.0 +## 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 Orien Madgwick. GitHub #131. +* Updated `connection_pool` dependency to allow version 3+. Reported by + Igor Kasyanchuk. GitHub #140. ## 1.4.0 (2025-11-20) diff --git a/Gemfile.lock b/Gemfile.lock index e77ef58..96c88c2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: . specs: - maxmind-geoip2 (1.4.0) + maxmind-geoip2 (1.5.1) connection_pool (>= 2.2, < 4.0) http (>= 4.3, < 6.0) maxmind-db (~> 1.4) @@ -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 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. diff --git a/dev-bin/release.sh b/dev-bin/release.sh index d2ee600..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) @@ -84,6 +85,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 diff --git a/lib/maxmind/geoip2/version.rb b/lib/maxmind/geoip2/version.rb index 01a4a01..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.4.0' + VERSION = '1.5.1' end end