Skip to content

Commit 9060a5f

Browse files
committed
💚 Fix more workflows
1 parent cc0c20c commit 9060a5f

File tree

12 files changed

+63
-52
lines changed

12 files changed

+63
-52
lines changed

.rubocop_gradual.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
],
3232
"lib/omniauth/identity/models/nobrainer.rb:3355783297": [
3333
[12, 9, 568, "Style/ClassMethodsDefinitions: Use `class << self` to define a class method.", 4204154330],
34-
[20, 13, 125, "Style/ClassMethodsDefinitions: Use `clases << self` to define a class method.", 3604044426],
34+
[20, 13, 125, "Style/ClassMethodsDefinitions: Use `class << self` to define a class method.", 3604044426],
3535
[25, 13, 83, "Style/ClassMethodsDefinitions: Use `class << self` to define a class method.", 902334745]
3636
],
3737
"lib/omniauth/identity/models/sequel.rb:3343978269": [
@@ -178,8 +178,8 @@
178178
[20, 7, 290, "RSpec/ExampleLength: Example has too many lines. [6/5]", 3358628882],
179179
[25, 9, 71, "RSpec/SubjectStub: Do not stub methods of the object under test.", 399334056]
180180
],
181-
"spec_orms/sequel_spec.rb:3336240631": [
182-
[8, 1, 60, "RSpec/SpecFilePathFormat: Spec path should end with `omni_auth/identity/models/sequel*_spec.rb`.", 36626431],
183-
[34, 9, 71, "RSpec/SubjectStub: Do not stub methods of the object under test.", 399334056]
181+
"spec_orms/sequel_spec.rb:1099118529": [
182+
[12, 1, 60, "RSpec/SpecFilePathFormat: Spec path should end with `omni_auth/identity/models/sequel*_spec.rb`.", 36626431],
183+
[38, 9, 71, "RSpec/SubjectStub: Do not stub methods of the object under test.", 399334056]
184184
]
185185
}

Appraisals

Lines changed: 44 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -65,13 +65,13 @@ appraise "ar-6-1-r2" do
6565
gem "stringio", "~> 3.0"
6666
gem "sqlite3", "~> 1.4", platforms: [:ruby]
6767
platforms :jruby do
68-
# gem 'jdbc-sqlite3', # github: "jruby/activerecord-jdbc-adapter", branch: '61-stable'
69-
# gem 'jdbc-mysql', # github: "jruby/activerecord-jdbc-adapter", branch: '61-stable'
70-
# gem 'jdbc-postgres', # github: "jruby/activerecord-jdbc-adapter", branch: '61-stable'
71-
gem "activerecord-jdbc-adapter", "~> 61.0" # github: "jruby/activerecord-jdbc-adapter", branch: '61-stable'
72-
gem "activerecord-jdbcsqlite3-adapter", "~> 61.0" # github: "jruby/activerecord-jdbc-adapter", branch: '61-stable'
73-
# gem "activerecord-jdbcmysql-adapter", "~> 61.0" # github: "jruby/activerecord-jdbc-adapter", branch: '61-stable'
74-
# gem "activerecord-jdbcpostgresql-adapter", "~> 61.0" # github: "jruby/activerecord-jdbc-adapter", branch: '61-stable'
68+
gem "jdbc-sqlite3" # github: "jruby/activerecord-jdbc-adapter", branch: '61-stable'
69+
# gem 'jdbc-mysql', # github: "jruby/activerecord-jdbc-adapter", branch: '61-stable'
70+
# gem 'jdbc-postgres', # github: "jruby/activerecord-jdbc-adapter", branch: '61-stable'
71+
gem "activerecord-jdbc-adapter", "~> 61.0" # github: "jruby/activerecord-jdbc-adapter", branch: '61-stable'
72+
gem "activerecord-jdbcsqlite3-adapter", "~> 61.0" # github: "jruby/activerecord-jdbc-adapter", branch: '61-stable'
73+
# gem "activerecord-jdbcmysql-adapter", "~> 71.0" # github: "jruby/activerecord-jdbc-adapter", branch: '61-stable'
74+
# gem "activerecord-jdbcpostgresql-adapter", "~> 71.0" # github: "jruby/activerecord-jdbc-adapter", branch: '61-stable'
7575
end
7676
eval_gemfile "modular/omniauth_v1_2.gemfile"
7777
remove_gem "appraisal" # only present because it must be in the gemfile because we target a git branch
@@ -86,13 +86,13 @@ appraise "ar-6-1-r3" do
8686
gem "stringio", "~> 3.0"
8787
gem "sqlite3", "~> 1.4", platforms: [:ruby]
8888
platforms :jruby do
89-
# gem 'jdbc-sqlite3', # github: "jruby/activerecord-jdbc-adapter", branch: '61-stable'
90-
# gem 'jdbc-mysql', # github: "jruby/activerecord-jdbc-adapter", branch: '61-stable'
91-
# gem 'jdbc-postgres', # github: "jruby/activerecord-jdbc-adapter", branch: '61-stable'
92-
gem "activerecord-jdbc-adapter", "~> 61.0" # github: "jruby/activerecord-jdbc-adapter", branch: '61-stable'
93-
gem "activerecord-jdbcsqlite3-adapter", "~> 61.0" # github: "jruby/activerecord-jdbc-adapter", branch: '61-stable'
94-
# gem "activerecord-jdbcmysql-adapter", "~> 61.0" # github: "jruby/activerecord-jdbc-adapter", branch: '61-stable'
95-
# gem "activerecord-jdbcpostgresql-adapter", "~> 61.0" # github: "jruby/activerecord-jdbc-adapter", branch: '61-stable'
89+
gem "jdbc-sqlite3" # github: "jruby/activerecord-jdbc-adapter", branch: '61-stable'
90+
# gem 'jdbc-mysql', # github: "jruby/activerecord-jdbc-adapter", branch: '61-stable'
91+
# gem 'jdbc-postgres', # github: "jruby/activerecord-jdbc-adapter", branch: '61-stable'
92+
gem "activerecord-jdbc-adapter", "~> 61.0" # github: "jruby/activerecord-jdbc-adapter", branch: '61-stable'
93+
gem "activerecord-jdbcsqlite3-adapter", "~> 61.0" # github: "jruby/activerecord-jdbc-adapter", branch: '61-stable'
94+
# gem "activerecord-jdbcmysql-adapter", "~> 71.0" # github: "jruby/activerecord-jdbc-adapter", branch: '61-stable'
95+
# gem "activerecord-jdbcpostgresql-adapter", "~> 71.0" # github: "jruby/activerecord-jdbc-adapter", branch: '61-stable'
9696
end
9797
eval_gemfile "modular/omniauth_v2_1.gemfile"
9898
remove_gem "appraisal" # only present because it must be in the gemfile because we target a git branch
@@ -107,13 +107,13 @@ appraise "ar-7-0-r2" do
107107
gem "stringio", "~> 3.0"
108108
gem "sqlite3", "~> 1.4", platforms: [:ruby]
109109
platforms :jruby do
110-
# gem 'jdbc-sqlite3', # github: "jruby/activerecord-jdbc-adapter", branch: '61-stable'
111-
# gem 'jdbc-mysql', # github: "jruby/activerecord-jdbc-adapter", branch: '61-stable'
112-
# gem 'jdbc-postgres', # github: "jruby/activerecord-jdbc-adapter", branch: '61-stable'
113-
gem "activerecord-jdbc-adapter", "~> 70.0" # github: "jruby/activerecord-jdbc-adapter", branch: '61-stable'
114-
gem "activerecord-jdbcsqlite3-adapter", "~> 70.0" # github: "jruby/activerecord-jdbc-adapter", branch: '61-stable'
115-
# gem "activerecord-jdbcmysql-adapter", "~> 61.0" # github: "jruby/activerecord-jdbc-adapter", branch: '61-stable'
116-
# gem "activerecord-jdbcpostgresql-adapter", "~> 61.0" # github: "jruby/activerecord-jdbc-adapter", branch: '61-stable'
110+
gem "jdbc-sqlite3" # github: "jruby/activerecord-jdbc-adapter", branch: '61-stable'
111+
# gem 'jdbc-mysql', # github: "jruby/activerecord-jdbc-adapter", branch: '61-stable'
112+
# gem 'jdbc-postgres', # github: "jruby/activerecord-jdbc-adapter", branch: '61-stable'
113+
gem "activerecord-jdbc-adapter", "~> 70.0" # github: "jruby/activerecord-jdbc-adapter", branch: '61-stable'
114+
gem "activerecord-jdbcsqlite3-adapter", "~> 70.0" # github: "jruby/activerecord-jdbc-adapter", branch: '61-stable'
115+
# gem "activerecord-jdbcmysql-adapter", "~> 71.0" # github: "jruby/activerecord-jdbc-adapter", branch: '61-stable'
116+
# gem "activerecord-jdbcpostgresql-adapter", "~> 71.0" # github: "jruby/activerecord-jdbc-adapter", branch: '61-stable'
117117
end
118118

119119
eval_gemfile "modular/omniauth_v1_3.gemfile"
@@ -130,13 +130,13 @@ appraise "ar-7-0-r3" do
130130
gem "stringio", "~> 3.0"
131131
gem "sqlite3", "~> 1.4", platforms: [:ruby]
132132
platforms :jruby do
133-
# gem 'jdbc-sqlite3', # github: "jruby/activerecord-jdbc-adapter", branch: '61-stable'
134-
# gem 'jdbc-mysql', # github: "jruby/activerecord-jdbc-adapter", branch: '61-stable'
135-
# gem 'jdbc-postgres', # github: "jruby/activerecord-jdbc-adapter", branch: '61-stable'
136-
gem "activerecord-jdbc-adapter", "~> 70.0" # github: "jruby/activerecord-jdbc-adapter", branch: '61-stable'
137-
gem "activerecord-jdbcsqlite3-adapter", "~> 70.0" # github: "jruby/activerecord-jdbc-adapter", branch: '61-stable'
138-
# gem "activerecord-jdbcmysql-adapter", "~> 61.0" # github: "jruby/activerecord-jdbc-adapter", branch: '61-stable'
139-
# gem "activerecord-jdbcpostgresql-adapter", "~> 61.0" # github: "jruby/activerecord-jdbc-adapter", branch: '61-stable'
133+
gem "jdbc-sqlite3" # github: "jruby/activerecord-jdbc-adapter", branch: '61-stable'
134+
# gem 'jdbc-mysql', # github: "jruby/activerecord-jdbc-adapter", branch: '61-stable'
135+
# gem 'jdbc-postgres', # github: "jruby/activerecord-jdbc-adapter", branch: '61-stable'
136+
gem "activerecord-jdbc-adapter", "~> 70.0" # github: "jruby/activerecord-jdbc-adapter", branch: '61-stable'
137+
gem "activerecord-jdbcsqlite3-adapter", "~> 70.0" # github: "jruby/activerecord-jdbc-adapter", branch: '61-stable'
138+
# gem "activerecord-jdbcmysql-adapter", "~> 71.0" # github: "jruby/activerecord-jdbc-adapter", branch: '61-stable'
139+
# gem "activerecord-jdbcpostgresql-adapter", "~> 71.0" # github: "jruby/activerecord-jdbc-adapter", branch: '61-stable'
140140
end
141141

142142
eval_gemfile "modular/omniauth_v2_1.gemfile"
@@ -152,13 +152,13 @@ appraise "ar-7-1-r2" do
152152
gem "stringio", "~> 3.0"
153153
gem "sqlite3", "~> 1.5", platforms: [:ruby]
154154
platforms :jruby do
155-
# gem 'jdbc-sqlite3', # github: "jruby/activerecord-jdbc-adapter", branch: '61-stable'
156-
# gem 'jdbc-mysql', # github: "jruby/activerecord-jdbc-adapter", branch: '61-stable'
157-
# gem 'jdbc-postgres', # github: "jruby/activerecord-jdbc-adapter", branch: '61-stable'
158-
gem "activerecord-jdbc-adapter", "~> 71.0" # github: "jruby/activerecord-jdbc-adapter", branch: '61-stable'
159-
gem "activerecord-jdbcsqlite3-adapter", "~> 71.0" # github: "jruby/activerecord-jdbc-adapter", branch: '61-stable'
160-
# gem "activerecord-jdbcmysql-adapter", "~> 71.0" # github: "jruby/activerecord-jdbc-adapter", branch: '61-stable'
161-
# gem "activerecord-jdbcpostgresql-adapter", "~> 71.0" # github: "jruby/activerecord-jdbc-adapter", branch: '61-stable'
155+
gem "jdbc-sqlite3" # github: "jruby/activerecord-jdbc-adapter", branch: '61-stable'
156+
# gem 'jdbc-mysql', # github: "jruby/activerecord-jdbc-adapter", branch: '61-stable'
157+
# gem 'jdbc-postgres', # github: "jruby/activerecord-jdbc-adapter", branch: '61-stable'
158+
gem "activerecord-jdbc-adapter", "~> 71.0" # github: "jruby/activerecord-jdbc-adapter", branch: '61-stable'
159+
gem "activerecord-jdbcsqlite3-adapter", "~> 71.0" # github: "jruby/activerecord-jdbc-adapter", branch: '61-stable'
160+
# gem "activerecord-jdbcmysql-adapter", "~> 71.0" # github: "jruby/activerecord-jdbc-adapter", branch: '61-stable'
161+
# gem "activerecord-jdbcpostgresql-adapter", "~> 71.0" # github: "jruby/activerecord-jdbc-adapter", branch: '61-stable'
162162
end
163163
eval_gemfile "modular/omniauth_v1_4.gemfile"
164164
remove_gem "appraisal" # only present because it must be in the gemfile because we target a git branch
@@ -175,13 +175,13 @@ appraise "ar-7-1-r3" do
175175
gem "stringio", "~> 3.0"
176176
gem "sqlite3", "~> 1.5", platforms: [:ruby]
177177
platforms :jruby do
178-
# gem 'jdbc-sqlite3', # github: "jruby/activerecord-jdbc-adapter", branch: '61-stable'
179-
# gem 'jdbc-mysql', # github: "jruby/activerecord-jdbc-adapter", branch: '61-stable'
180-
# gem 'jdbc-postgres', # github: "jruby/activerecord-jdbc-adapter", branch: '61-stable'
181-
gem "activerecord-jdbc-adapter", "~> 71.0" # github: "jruby/activerecord-jdbc-adapter", branch: '61-stable'
182-
gem "activerecord-jdbcsqlite3-adapter", "~> 71.0" # github: "jruby/activerecord-jdbc-adapter", branch: '61-stable'
183-
# gem "activerecord-jdbcmysql-adapter", "~> 71.0" # github: "jruby/activerecord-jdbc-adapter", branch: '61-stable'
184-
# gem "activerecord-jdbcpostgresql-adapter", "~> 71.0" # github: "jruby/activerecord-jdbc-adapter", branch: '61-stable'
178+
gem "jdbc-sqlite3" # github: "jruby/activerecord-jdbc-adapter", branch: '61-stable'
179+
# gem 'jdbc-mysql', # github: "jruby/activerecord-jdbc-adapter", branch: '61-stable'
180+
# gem 'jdbc-postgres', # github: "jruby/activerecord-jdbc-adapter", branch: '61-stable'
181+
gem "activerecord-jdbc-adapter", "~> 71.0" # github: "jruby/activerecord-jdbc-adapter", branch: '61-stable'
182+
gem "activerecord-jdbcsqlite3-adapter", "~> 71.0" # github: "jruby/activerecord-jdbc-adapter", branch: '61-stable'
183+
# gem "activerecord-jdbcmysql-adapter", "~> 71.0" # github: "jruby/activerecord-jdbc-adapter", branch: '61-stable'
184+
# gem "activerecord-jdbcpostgresql-adapter", "~> 71.0" # github: "jruby/activerecord-jdbc-adapter", branch: '61-stable'
185185
end
186186
eval_gemfile "modular/omniauth_v2_1.gemfile"
187187
remove_gem "appraisal" # only present because it must be in the gemfile because we target a git branch
@@ -203,6 +203,7 @@ appraise "ar-7-2" do
203203
platforms :jruby do
204204
gem "activerecord-jdbc-adapter", github: "JesseChavez/activerecord-jdbc-adapter", branch: "stable-dev"
205205
gem "activerecord-jdbcsqlite3-adapter", github: "JesseChavez/activerecord-jdbc-adapter", branch: "stable-dev"
206+
gem "jdbc-sqlite3", github: "JesseChavez/activerecord-jdbc-adapter", branch: "stable-dev"
206207
end
207208

208209
# platforms :jruby do
@@ -237,6 +238,7 @@ appraise "ar-8-0" do
237238
platforms :jruby do
238239
gem "activerecord-jdbc-adapter", github: "JesseChavez/activerecord-jdbc-adapter", branch: "stable-dev"
239240
gem "activerecord-jdbcsqlite3-adapter", github: "JesseChavez/activerecord-jdbc-adapter", branch: "stable-dev"
241+
gem "jdbc-sqlite3", github: "JesseChavez/activerecord-jdbc-adapter", branch: "stable-dev"
240242
end
241243

242244
# NOTE: JRuby is not yet compatible with Rails 8 (or vice versa)

gemfiles/ar_6_1_r2.gemfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ gem "stringio", "~> 3.0"
88
gem "sqlite3", "~> 1.4", platforms: [:ruby]
99

1010
platforms :jruby do
11+
gem "jdbc-sqlite3"
1112
gem "activerecord-jdbc-adapter", "~> 61.0"
1213
gem "activerecord-jdbcsqlite3-adapter", "~> 61.0"
1314
end

gemfiles/ar_6_1_r3.gemfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ gem "stringio", "~> 3.0"
88
gem "sqlite3", "~> 1.4", platforms: [:ruby]
99

1010
platforms :jruby do
11+
gem "jdbc-sqlite3"
1112
gem "activerecord-jdbc-adapter", "~> 61.0"
1213
gem "activerecord-jdbcsqlite3-adapter", "~> 61.0"
1314
end

gemfiles/ar_7_0_r2.gemfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ gem "stringio", "~> 3.0"
88
gem "sqlite3", "~> 1.4", platforms: [:ruby]
99

1010
platforms :jruby do
11+
gem "jdbc-sqlite3"
1112
gem "activerecord-jdbc-adapter", "~> 70.0"
1213
gem "activerecord-jdbcsqlite3-adapter", "~> 70.0"
1314
end

gemfiles/ar_7_0_r3.gemfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ gem "stringio", "~> 3.0"
88
gem "sqlite3", "~> 1.4", platforms: [:ruby]
99

1010
platforms :jruby do
11+
gem "jdbc-sqlite3"
1112
gem "activerecord-jdbc-adapter", "~> 70.0"
1213
gem "activerecord-jdbcsqlite3-adapter", "~> 70.0"
1314
end

gemfiles/ar_7_1_r2.gemfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ gem "stringio", "~> 3.0"
88
gem "sqlite3", "~> 1.5", platforms: [:ruby]
99

1010
platforms :jruby do
11+
gem "jdbc-sqlite3"
1112
gem "activerecord-jdbc-adapter", "~> 71.0"
1213
gem "activerecord-jdbcsqlite3-adapter", "~> 71.0"
1314
end

gemfiles/ar_7_1_r3.gemfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ gem "stringio", "~> 3.0"
88
gem "sqlite3", "~> 1.5", platforms: [:ruby]
99

1010
platforms :jruby do
11+
gem "jdbc-sqlite3"
1112
gem "activerecord-jdbc-adapter", "~> 71.0"
1213
gem "activerecord-jdbcsqlite3-adapter", "~> 71.0"
1314
end

gemfiles/ar_7_2.gemfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ gem "sqlite3", "~> 1.6", platforms: [:ruby]
1010
platforms :jruby do
1111
gem "activerecord-jdbc-adapter", branch: "stable-dev", git: "https://github.com/JesseChavez/activerecord-jdbc-adapter"
1212
gem "activerecord-jdbcsqlite3-adapter", branch: "stable-dev", git: "https://github.com/JesseChavez/activerecord-jdbc-adapter"
13+
gem "jdbc-sqlite3", branch: "stable-dev", git: "https://github.com/JesseChavez/activerecord-jdbc-adapter"
1314
end
1415

1516
gemspec path: "../"

gemfiles/ar_8_0.gemfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ gem "sqlite3", ">= 1.7", platforms: [:ruby]
1010
platforms :jruby do
1111
gem "activerecord-jdbc-adapter", branch: "stable-dev", git: "https://github.com/JesseChavez/activerecord-jdbc-adapter"
1212
gem "activerecord-jdbcsqlite3-adapter", branch: "stable-dev", git: "https://github.com/JesseChavez/activerecord-jdbc-adapter"
13+
gem "jdbc-sqlite3", branch: "stable-dev", git: "https://github.com/JesseChavez/activerecord-jdbc-adapter"
1314
end
1415

1516
gemspec path: "../"

0 commit comments

Comments
 (0)