From 374b879c8a65f407107dd79e6ddf1c372b45993a Mon Sep 17 00:00:00 2001 From: Yasuo Honda Date: Tue, 5 May 2026 22:36:56 +0900 Subject: [PATCH] Move Rails-main Gemfile to top level and add gemfiles/Gemfile.activerecord-8.1 Top-level Gemfile now tracks Rails main (rails/rails:main) and the oracle-enhanced adapter master (rsim/oracle-enhanced:master), mirroring how the previous gemfiles/Gemfile.activerecord-main pulled in bleeding-edge dependencies. Picking up rails/rails main as the default development target surfaces upstream regressions earlier than waiting for a released Rails line. Add gemfiles/Gemfile.activerecord-8.1 pinned to ~> 8.1.0 (matching the style of Gemfile.activerecord-8.0) and wire it into .github/workflows/test_gemfiles.yml so 8.1 gets the same matrix coverage the other released Rails lines have. The 8.1 row uses Ruby 3.3 because activerecord-oracle_enhanced-adapter 8.1.x requires Ruby >= 3.3.1. Drop Ruby 3.2 from .github/workflows/test.yml and test_11g.yml matrices for the same reason: those workflows resolve against the top-level Gemfile, which now pulls oracle-enhanced master and inherits its Ruby >= 3.3.1 requirement. Ruby 3.2 coverage continues through gemfiles/Gemfile.activerecord-8.0 (and earlier rows) in test_gemfiles.yml. Remove the redundant gemfiles/Gemfile.activerecord-main; tracking Rails main now happens in the top-level Gemfile. Co-Authored-By: Claude Opus 4.7 (1M context) --- .github/workflows/test.yml | 1 - .github/workflows/test_11g.yml | 1 - .github/workflows/test_gemfiles.yml | 2 ++ Gemfile | 4 ++-- .../{Gemfile.activerecord-main => Gemfile.activerecord-8.1} | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) rename gemfiles/{Gemfile.activerecord-main => Gemfile.activerecord-8.1} (67%) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 4d93acec..6f038253 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -15,7 +15,6 @@ jobs: '4.0', '3.4', '3.3', - '3.2', 'jruby-10.1.0.0', ] env: diff --git a/.github/workflows/test_11g.yml b/.github/workflows/test_11g.yml index ef975acb..04e33472 100644 --- a/.github/workflows/test_11g.yml +++ b/.github/workflows/test_11g.yml @@ -19,7 +19,6 @@ jobs: '4.0', '3.4', '3.3', - '3.2', 'jruby-10.1.0.0', ] env: diff --git a/.github/workflows/test_gemfiles.yml b/.github/workflows/test_gemfiles.yml index e2a1ff40..a92784cd 100644 --- a/.github/workflows/test_gemfiles.yml +++ b/.github/workflows/test_gemfiles.yml @@ -38,6 +38,8 @@ jobs: ruby: '3.1' - gemfile: gemfiles/Gemfile.activerecord-8.0 ruby: '3.2' + - gemfile: gemfiles/Gemfile.activerecord-8.1 + ruby: '3.3' env: BUNDLE_GEMFILE: ${{ matrix.gemfile }} NLS_LANG: AMERICAN_AMERICA.AL32UTF8 diff --git a/Gemfile b/Gemfile index 1f50043c..85d1363f 100644 --- a/Gemfile +++ b/Gemfile @@ -16,8 +16,8 @@ group :test, :development do gem "rspec", "~> 3.1" unless ENV["NO_ACTIVERECORD"] - gem "activerecord", "~> 8.0" - gem "activerecord-oracle_enhanced-adapter", "~> 8.0" + gem "activerecord", github: "rails/rails", branch: "main" + gem "activerecord-oracle_enhanced-adapter", github: "rsim/oracle-enhanced", branch: "master" gem "simplecov", ">= 0" end diff --git a/gemfiles/Gemfile.activerecord-main b/gemfiles/Gemfile.activerecord-8.1 similarity index 67% rename from gemfiles/Gemfile.activerecord-main rename to gemfiles/Gemfile.activerecord-8.1 index 1fcbb691..3956cc8c 100644 --- a/gemfiles/Gemfile.activerecord-main +++ b/gemfiles/Gemfile.activerecord-8.1 @@ -10,8 +10,8 @@ group :test, :development do gem 'rspec', '~> 3.1' unless ENV['NO_ACTIVERECORD'] - gem 'activerecord', github: 'rails/rails', branch: 'main' - gem 'activerecord-oracle_enhanced-adapter', github: 'rsim/oracle-enhanced', branch: 'master' + gem 'activerecord', '~> 8.1.0' + gem 'activerecord-oracle_enhanced-adapter', '~> 8.1.0' gem 'simplecov', '>= 0' end