Skip to content

Commit 15c773d

Browse files
committed
👷 Add JRuby back to CI (x)
1 parent 1aadd29 commit 15c773d

File tree

4 files changed

+7
-6
lines changed

4 files changed

+7
-6
lines changed

Appraisals

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ appraise "ar-7-1" do
7171
gem "activerecord", "~> 7.1.5"
7272
gem "mutex_m", "~> 0.2"
7373
gem "stringio", "~> 3.0"
74-
gem "sqlite3", "~> 1.5"
74+
gem "sqlite3", "~> 1.5", platforms: [:ruby]
7575
platforms :jruby do
7676
# gem 'jdbc-sqlite3', # github: "jruby/activerecord-jdbc-adapter", branch: '61-stable'
7777
# gem 'jdbc-mysql', # github: "jruby/activerecord-jdbc-adapter", branch: '61-stable'

gemfiles/ar_7_1.gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ gem "appraisal", branch: "galtzo", git: "https://github.com/pboling/appraisal"
66
gem "activerecord", "~> 7.1.5"
77
gem "mutex_m", "~> 0.2"
88
gem "stringio", "~> 3.0"
9-
gem "sqlite3", "~> 1.5"
9+
gem "sqlite3", "~> 1.5", platforms: [:ruby]
1010

1111
platforms :jruby do
1212
gem "activerecord-jdbc-adapter", "~> 71.0"

spec/omniauth/strategies/identity_spec.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
# frozen_string_literal: true
22

3-
require "sqlite3"
43
require "active_record"
54
require "anonymous_active_record"
65

@@ -12,11 +11,12 @@
1211
let(:identity_hash) { env_hash["omniauth.identity"] }
1312
let(:identity_options) { {} }
1413
let(:app_options) { {} }
14+
let(:is_java) { RUBY_PLATFORM == "java" }
1515
let(:anon_ar) do
1616
AnonymousActiveRecord.generate(
1717
parent_klass: "OmniAuth::Identity::Models::ActiveRecord",
1818
columns: OmniAuth::Identity::Model::SCHEMA_ATTRIBUTES | %w[provider password_digest],
19-
connection_params: {adapter: "sqlite3", encoding: "utf8", database: ":memory:"},
19+
connection_params: {adapter: is_java ? "jdbcsqlite3" : "sqlite3", encoding: "utf8", database: ":memory:"},
2020
) do
2121
auth_key :email
2222
def balloon

spec_orms/active_record_spec.rb

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
# frozen_string_literal: true
22

3-
require "sqlite3"
43
require "active_record"
54
require "anonymous_active_record"
65

@@ -12,7 +11,7 @@ class TestIdentity < OmniAuth::Identity::Models::ActiveRecord; end
1211
AnonymousActiveRecord.generate(
1312
parent_klass: "OmniAuth::Identity::Models::ActiveRecord",
1413
columns: OmniAuth::Identity::Model::SCHEMA_ATTRIBUTES | %w[provider password_digest],
15-
connection_params: {adapter: "sqlite3", encoding: "utf8", database: ":memory:"},
14+
connection_params: {adapter: is_java ? "jdbcsqlite3" : "sqlite3", encoding: "utf8", database: ":memory:"},
1615
) do
1716
auth_key :email
1817
def flower
@@ -21,6 +20,8 @@ def flower
2120
end
2221
end
2322

23+
let(:is_java) { RUBY_PLATFORM == "java" }
24+
2425
include_context "persistable model"
2526

2627
describe "::table_name" do

0 commit comments

Comments
 (0)