Skip to content

Commit 5826c26

Browse files
committed
fix Rails 7.0.x Github test runs
1 parent 2d83cca commit 5826c26

File tree

5 files changed

+27
-19
lines changed

5 files changed

+27
-19
lines changed

.github/workflows/test.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,17 @@ jobs:
1111
fail-fast: false
1212
matrix:
1313
rails: [70, 71, 72, 80]
14-
ruby: [3.1, 3.2, 3.3]
14+
ruby: [3.1, 3.2, 3.3, 3.4]
1515
experimental: [false]
1616
exclude:
1717
- ruby: 3.1
1818
rails: 80
1919
include:
2020
- rails: head
21-
ruby: 3.2
21+
ruby: 3.3
2222
experimental: true
2323
- rails: head
24-
ruby: 3.3
24+
ruby: 3.4
2525
experimental: true
2626

2727
services:

Gemfile.lock

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ PATH
88
GEM
99
remote: https://rubygems.org/
1010
specs:
11-
activemodel (7.2.2)
12-
activesupport (= 7.2.2)
13-
activerecord (7.2.2)
14-
activemodel (= 7.2.2)
15-
activesupport (= 7.2.2)
11+
activemodel (8.0.3)
12+
activesupport (= 8.0.3)
13+
activerecord (8.0.3)
14+
activemodel (= 8.0.3)
15+
activesupport (= 8.0.3)
1616
timeout (>= 0.4.0)
17-
activesupport (7.2.2)
17+
activesupport (8.0.3)
1818
base64
1919
benchmark (>= 0.3)
2020
bigdecimal
@@ -26,14 +26,15 @@ GEM
2626
minitest (>= 5.1)
2727
securerandom (>= 0.3)
2828
tzinfo (~> 2.0, >= 2.0.5)
29+
uri (>= 0.13.1)
2930
ast (2.4.2)
3031
base64 (0.2.0)
31-
benchmark (0.4.0)
32+
benchmark (0.4.1)
3233
bigdecimal (3.1.8)
3334
byebug (11.1.3)
3435
coderay (1.1.3)
35-
concurrent-ruby (1.3.4)
36-
connection_pool (2.4.1)
36+
concurrent-ruby (1.3.5)
37+
connection_pool (2.5.4)
3738
database_cleaner (2.1.0)
3839
database_cleaner-active_record (>= 2, < 3)
3940
database_cleaner-active_record (2.2.0)
@@ -43,14 +44,14 @@ GEM
4344
diff-lcs (1.5.1)
4445
docile (1.4.1)
4546
dotenv (3.1.4)
46-
drb (2.2.1)
47-
i18n (1.14.6)
47+
drb (2.2.3)
48+
i18n (1.14.7)
4849
concurrent-ruby (~> 1.0)
4950
json (2.8.1)
5051
language_server-protocol (3.17.0.3)
51-
logger (1.6.1)
52+
logger (1.7.0)
5253
method_source (1.1.0)
53-
minitest (5.25.1)
54+
minitest (5.25.5)
5455
mutex_m (0.2.0)
5556
niceql (0.6.1)
5657
parallel (1.26.3)
@@ -65,7 +66,7 @@ GEM
6566
byebug (~> 11.0)
6667
pry (>= 0.13, < 0.15)
6768
racc (1.8.1)
68-
rails_sql_prettifier (7.0.4)
69+
rails_sql_prettifier (7.0.7)
6970
activerecord (>= 7)
7071
niceql (~> 0.6)
7172
rainbow (3.1.1)
@@ -104,17 +105,18 @@ GEM
104105
rubocop-rspec (3.2.0)
105106
rubocop (~> 1.61)
106107
ruby-progressbar (1.13.0)
107-
securerandom (0.3.1)
108+
securerandom (0.4.1)
108109
simplecov (0.22.0)
109110
docile (~> 1.1)
110111
simplecov-html (~> 0.11)
111112
simplecov_json_formatter (~> 0.1)
112113
simplecov-html (0.13.1)
113114
simplecov_json_formatter (0.1.4)
114-
timeout (0.4.2)
115+
timeout (0.4.3)
115116
tzinfo (2.0.6)
116117
concurrent-ruby (~> 1.0)
117118
unicode-display_width (2.6.0)
119+
uri (1.0.4)
118120

119121
PLATFORMS
120122
ruby

Rakefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ end
3636
namespace :db do
3737
desc "Loads the test database ENV file"
3838
task :load_db_settings do
39+
require "logger"
3940
require "active_record"
4041
unless ENV["DATABASE_URL"]
4142
require "dotenv"

gemfiles/activerecord-70.gemfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,6 @@ source "https://rubygems.org"
55
gemspec path: ".."
66
eval_gemfile "../Gemfile"
77

8+
89
gem "activerecord", "~> 7.0.0"
910
gem "pg", "< 2.0"

lib/active_record_extended.rb

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22

33
require "active_record_extended/version"
44

5+
if Gem::Requirement.new("~> 7.0.0").satisfied_by?(Gem::Version.new(ActiveRecord::VERSION::STRING))
6+
require "logger"
7+
end
8+
59
require "active_record"
610
require "active_record/relation"
711
require "active_record/relation/merger"

0 commit comments

Comments
 (0)