Skip to content

Commit 416e451

Browse files
authored
Merge pull request #281 from yahonda/bump-rails-8-1
Move activerecord-main Gemfile to top level and add gemfiles/Gemfile.activerecord-8.1
2 parents eaf2925 + 374b879 commit 416e451

5 files changed

Lines changed: 6 additions & 6 deletions

File tree

.github/workflows/test.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ jobs:
1515
'4.0',
1616
'3.4',
1717
'3.3',
18-
'3.2',
1918
'jruby-10.1.0.0',
2019
]
2120
env:

.github/workflows/test_11g.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ jobs:
1919
'4.0',
2020
'3.4',
2121
'3.3',
22-
'3.2',
2322
'jruby-10.1.0.0',
2423
]
2524
env:

.github/workflows/test_gemfiles.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@ jobs:
3838
ruby: '3.1'
3939
- gemfile: gemfiles/Gemfile.activerecord-8.0
4040
ruby: '3.2'
41+
- gemfile: gemfiles/Gemfile.activerecord-8.1
42+
ruby: '3.3'
4143
env:
4244
BUNDLE_GEMFILE: ${{ matrix.gemfile }}
4345
NLS_LANG: AMERICAN_AMERICA.AL32UTF8

Gemfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ group :test, :development do
1616
gem "rspec", "~> 3.1"
1717

1818
unless ENV["NO_ACTIVERECORD"]
19-
gem "activerecord", "~> 8.0"
20-
gem "activerecord-oracle_enhanced-adapter", "~> 8.0"
19+
gem "activerecord", github: "rails/rails", branch: "main"
20+
gem "activerecord-oracle_enhanced-adapter", github: "rsim/oracle-enhanced", branch: "master"
2121
gem "simplecov", ">= 0"
2222
end
2323

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ group :test, :development do
1010
gem 'rspec', '~> 3.1'
1111

1212
unless ENV['NO_ACTIVERECORD']
13-
gem 'activerecord', github: 'rails/rails', branch: 'main'
14-
gem 'activerecord-oracle_enhanced-adapter', github: 'rsim/oracle-enhanced', branch: 'master'
13+
gem 'activerecord', '~> 8.1.0'
14+
gem 'activerecord-oracle_enhanced-adapter', '~> 8.1.0'
1515
gem 'simplecov', '>= 0'
1616
end
1717

0 commit comments

Comments
 (0)