From dbe63693119cd6afa5ae80a98277dc4da0dd5306 Mon Sep 17 00:00:00 2001 From: Ryan Bigg Date: Sun, 15 Feb 2026 15:59:43 +1100 Subject: [PATCH 1/4] Run tests on Ruby 4.0, remove Ruby 3.2 support --- .github/dependabot.yml | 6 +- .github/workflows/ci.yml | 6 +- .gitignore | 1 + Gemfile | 1 + gemfiles/ruby3.2/Gemfile.lock | 89 --------------------------- gemfiles/{ruby3.2 => ruby4.0}/Gemfile | 2 +- 6 files changed, 9 insertions(+), 96 deletions(-) create mode 100644 Gemfile delete mode 100644 gemfiles/ruby3.2/Gemfile.lock rename gemfiles/{ruby3.2 => ruby4.0}/Gemfile (90%) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index ed5379f..8d3c7ce 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -1,7 +1,7 @@ version: 2 updates: - package-ecosystem: bundler - directory: /gemfiles/ruby3.2 + directory: /gemfiles/ruby3.3 schedule: interval: weekly groups: @@ -10,7 +10,7 @@ updates: - "minor" - "patch" - package-ecosystem: bundler - directory: /gemfiles/ruby3.3 + directory: /gemfiles/ruby3.4 schedule: interval: weekly groups: @@ -19,7 +19,7 @@ updates: - "minor" - "patch" - package-ecosystem: bundler - directory: /gemfiles/ruby3.4 + directory: /gemfiles/ruby4.0 schedule: interval: weekly groups: diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e73c12f..1d2d49e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -5,7 +5,7 @@ on: branches: - main tags: - - '*.*.*' + - "*.*.*" pull_request: jobs: @@ -14,9 +14,9 @@ jobs: strategy: matrix: ruby-version: - - 3.2 - 3.3 - 3.4 + - 4.0 steps: - uses: actions/checkout@v4 @@ -85,4 +85,4 @@ jobs: gem push *.gem env: GIT_AUTHOR_NAME: Fat Zebra - GIT_AUTHOR_EMAIL: support@fatzebra.com \ No newline at end of file + GIT_AUTHOR_EMAIL: support@fatzebra.com diff --git a/.gitignore b/.gitignore index d5b37dd..0e8df54 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ pkg/* doc/ .byebug_history .ruby-version +Gemfile.lock diff --git a/Gemfile b/Gemfile new file mode 100644 index 0000000..61c8280 --- /dev/null +++ b/Gemfile @@ -0,0 +1 @@ +eval_gemfile "gemfiles/ruby3.4/Gemfile" diff --git a/gemfiles/ruby3.2/Gemfile.lock b/gemfiles/ruby3.2/Gemfile.lock deleted file mode 100644 index 447dfe0..0000000 --- a/gemfiles/ruby3.2/Gemfile.lock +++ /dev/null @@ -1,89 +0,0 @@ -PATH - remote: ../.. - specs: - fat_zebra (0.0.0.pre.build) - -GEM - remote: http://rubygems.org/ - specs: - addressable (2.8.7) - public_suffix (>= 2.0.2, < 7.0) - ast (2.4.3) - base64 (0.3.0) - bigdecimal (3.2.2) - byebug (12.0.0) - crack (1.0.0) - bigdecimal - rexml - diff-lcs (1.6.2) - hashdiff (1.2.0) - json (2.13.2) - language_server-protocol (3.17.0.5) - lint_roller (1.1.0) - parallel (1.27.0) - parser (3.3.9.0) - ast (~> 2.4.1) - racc - prism (1.4.0) - public_suffix (6.0.2) - racc (1.8.1) - rainbow (3.1.1) - rake (13.3.0) - regexp_parser (2.11.0) - rexml (3.4.1) - rspec (3.13.1) - rspec-core (~> 3.13.0) - rspec-expectations (~> 3.13.0) - rspec-mocks (~> 3.13.0) - rspec-core (3.13.5) - rspec-support (~> 3.13.0) - rspec-expectations (3.13.5) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.13.0) - rspec-mocks (3.13.5) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.13.0) - rspec-support (3.13.4) - rubocop (1.79.2) - json (~> 2.3) - language_server-protocol (~> 3.17.0.2) - lint_roller (~> 1.1.0) - parallel (~> 1.10) - parser (>= 3.3.0.2) - rainbow (>= 2.2.2, < 4.0) - regexp_parser (>= 2.9.3, < 3.0) - rubocop-ast (>= 1.46.0, < 2.0) - ruby-progressbar (~> 1.7) - unicode-display_width (>= 2.4.0, < 4.0) - rubocop-ast (1.46.0) - parser (>= 3.3.7.2) - prism (~> 1.4) - ruby-progressbar (1.13.0) - unicode-display_width (3.1.4) - unicode-emoji (~> 4.0, >= 4.0.4) - unicode-emoji (4.0.4) - vcr (6.3.1) - base64 - webmock (3.25.1) - addressable (>= 2.8.0) - crack (>= 0.3.2) - hashdiff (>= 0.4.0, < 2.0.0) - -PLATFORMS - arm64-darwin-24 - x86_64-linux - -DEPENDENCIES - byebug - fat_zebra! - rake - rspec - rubocop - vcr - webmock - -RUBY VERSION - ruby 3.2.10p266 - -BUNDLED WITH - 2.4.19 diff --git a/gemfiles/ruby3.2/Gemfile b/gemfiles/ruby4.0/Gemfile similarity index 90% rename from gemfiles/ruby3.2/Gemfile rename to gemfiles/ruby4.0/Gemfile index f43e512..d273d07 100644 --- a/gemfiles/ruby3.2/Gemfile +++ b/gemfiles/ruby4.0/Gemfile @@ -2,7 +2,7 @@ source 'http://rubygems.org' -ruby '3.2.10' +ruby '~> 4.0' # Specify your gem's dependencies in FatZebra.gemspec gemspec path: '../../' From 653897368947bcc4ee04e277a188e092790ca8f5 Mon Sep 17 00:00:00 2001 From: Ryan Bigg Date: Sun, 15 Feb 2026 16:24:55 +1100 Subject: [PATCH 2/4] Bump rexml version --- gemfiles/ruby3.3/Gemfile | 2 +- gemfiles/ruby3.3/Gemfile.lock | 2 +- gemfiles/ruby3.4/Gemfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gemfiles/ruby3.3/Gemfile b/gemfiles/ruby3.3/Gemfile index 9f6a5f2..d09390d 100644 --- a/gemfiles/ruby3.3/Gemfile +++ b/gemfiles/ruby3.3/Gemfile @@ -2,7 +2,7 @@ source 'http://rubygems.org' -ruby '3.3.10' +ruby '~> 3.3' # Specify your gem's dependencies in FatZebra.gemspec gemspec path: '../../' diff --git a/gemfiles/ruby3.3/Gemfile.lock b/gemfiles/ruby3.3/Gemfile.lock index f3831f1..3135edc 100644 --- a/gemfiles/ruby3.3/Gemfile.lock +++ b/gemfiles/ruby3.3/Gemfile.lock @@ -30,7 +30,7 @@ GEM rainbow (3.1.1) rake (13.3.0) regexp_parser (2.11.0) - rexml (3.4.1) + rexml (3.4.4) rspec (3.13.1) rspec-core (~> 3.13.0) rspec-expectations (~> 3.13.0) diff --git a/gemfiles/ruby3.4/Gemfile b/gemfiles/ruby3.4/Gemfile index aeaa2eb..679dd58 100644 --- a/gemfiles/ruby3.4/Gemfile +++ b/gemfiles/ruby3.4/Gemfile @@ -2,7 +2,7 @@ source 'http://rubygems.org' -ruby '3.4.8' +ruby '~> 3.4' # Specify your gem's dependencies in FatZebra.gemspec gemspec path: '../../' From 317b5a5fe42ca13ccab704186ebceb7574f5030d Mon Sep 17 00:00:00 2001 From: Ryan Bigg Date: Sun, 15 Feb 2026 16:29:45 +1100 Subject: [PATCH 3/4] Fix gemfiles dir --- gemfiles/{ruby4.0 => ruby4}/Gemfile | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename gemfiles/{ruby4.0 => ruby4}/Gemfile (100%) diff --git a/gemfiles/ruby4.0/Gemfile b/gemfiles/ruby4/Gemfile similarity index 100% rename from gemfiles/ruby4.0/Gemfile rename to gemfiles/ruby4/Gemfile From 1a4bc64a839b2a3c891b939d015e7c20306c9104 Mon Sep 17 00:00:00 2001 From: Ryan Bigg Date: Mon, 16 Feb 2026 15:08:18 +1100 Subject: [PATCH 4/4] Appease the cop --- Gemfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 61c8280..1c2cf13 100644 --- a/Gemfile +++ b/Gemfile @@ -1 +1,3 @@ -eval_gemfile "gemfiles/ruby3.4/Gemfile" +# frozen_string_literal: true + +eval_gemfile 'gemfiles/ruby3.4/Gemfile'