Skip to content

Commit 64d5129

Browse files
committed
👷 Add JRuby back to CI (vii)
1 parent 43a73ee commit 64d5129

File tree

4 files changed

+26
-16
lines changed

4 files changed

+26
-16
lines changed

Appraisals

Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,15 @@ appraise "ar-7-1" do
7272
gem "mutex_m", "~> 0.2"
7373
gem "stringio", "~> 3.0"
7474
gem "sqlite3", "~> 1.5"
75+
platforms :jruby do
76+
# gem "jdbc-sqlite3", github: "jruby/activerecord-jdbc-adapter", branch: "master"
77+
# gem "jdbc-mysql", github: "jruby/activerecord-jdbc-adapter", branch: "master"
78+
# gem "jdbc-postgres", github: "jruby/activerecord-jdbc-adapter", branch: "master"
79+
gem "activerecord-jdbc-adapter", github: "jruby/activerecord-jdbc-adapter", branch: "master"
80+
gem "activerecord-jdbcsqlite3-adapter", github: "jruby/activerecord-jdbc-adapter", branch: "master"
81+
# gem "activerecord-jdbcmysql-adapter", github: "jruby/activerecord-jdbc-adapter", branch: "master"
82+
# gem "activerecord-jdbcpostgresql-adapter", github: "jruby/activerecord-jdbc-adapter", branch: "master"
83+
end
7584
end
7685

7786
# Compat: Ruby >= 3.1
@@ -85,15 +94,16 @@ appraise "ar-7-2" do
8594
gem "mutex_m", "~> 0.2"
8695
gem "stringio", "~> 3.0"
8796
gem "sqlite3", "~> 1.6", platforms: [:ruby]
88-
platforms :jruby do
89-
# gem "jdbc-sqlite3", github: "jruby/activerecord-jdbc-adapter", branch: "master"
90-
# gem "jdbc-mysql", github: "jruby/activerecord-jdbc-adapter", branch: "master"
91-
# gem "jdbc-postgres", github: "jruby/activerecord-jdbc-adapter", branch: "master"
92-
gem "activerecord-jdbc-adapter", github: "jruby/activerecord-jdbc-adapter", branch: "master"
93-
gem "activerecord-jdbcsqlite3-adapter", github: "jruby/activerecord-jdbc-adapter", branch: "master"
94-
# gem "activerecord-jdbcmysql-adapter", github: "jruby/activerecord-jdbc-adapter", branch: "master"
95-
# gem "activerecord-jdbcpostgresql-adapter", github: "jruby/activerecord-jdbc-adapter", branch: "master"
96-
end
97+
# NOTE: JRuby is still working on compatibility with Rails 7.2
98+
# platforms :jruby do
99+
# # gem "jdbc-sqlite3", github: "jruby/activerecord-jdbc-adapter", branch: "master"
100+
# # gem "jdbc-mysql", github: "jruby/activerecord-jdbc-adapter", branch: "master"
101+
# # gem "jdbc-postgres", github: "jruby/activerecord-jdbc-adapter", branch: "master"
102+
# gem "activerecord-jdbc-adapter", github: "jruby/activerecord-jdbc-adapter", branch: "master"
103+
# gem "activerecord-jdbcsqlite3-adapter", github: "jruby/activerecord-jdbc-adapter", branch: "master"
104+
# # gem "activerecord-jdbcmysql-adapter", github: "jruby/activerecord-jdbc-adapter", branch: "master"
105+
# # gem "activerecord-jdbcpostgresql-adapter", github: "jruby/activerecord-jdbc-adapter", branch: "master"
106+
# end
97107
end
98108

99109
# Compat: Ruby >= 3.2

gemfiles/ar_6_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", "~> 6.1.7.10"
77
gem "mutex_m", "~> 0.1"
88
gem "stringio", "~> 3.0"
9-
gem "sqlite3", "~> 1.4"
9+
gem "sqlite3", "~> 1.4", platforms: [:ruby]
1010

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

gemfiles/ar_7_1.gemfile

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,9 @@ gem "mutex_m", "~> 0.2"
88
gem "stringio", "~> 3.0"
99
gem "sqlite3", "~> 1.5"
1010

11+
platforms :jruby do
12+
gem "activerecord-jdbc-adapter", branch: "master", git: "https://github.com/jruby/activerecord-jdbc-adapter"
13+
gem "activerecord-jdbcsqlite3-adapter", branch: "master", git: "https://github.com/jruby/activerecord-jdbc-adapter"
14+
end
15+
1116
gemspec path: "../"

gemfiles/ar_7_2.gemfile

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,6 @@ gem "appraisal", branch: "galtzo", git: "https://github.com/pboling/appraisal"
66
gem "activerecord", "~> 7.2.2"
77
gem "mutex_m", "~> 0.2"
88
gem "stringio", "~> 3.0"
9-
gem "sqlite3", "~> 1.6"
10-
11-
platforms :jruby do
12-
gem "activerecord-jdbc-adapter", branch: "master", git: "https://github.com/jruby/activerecord-jdbc-adapter"
13-
gem "activerecord-jdbcsqlite3-adapter", branch: "master", git: "https://github.com/jruby/activerecord-jdbc-adapter"
14-
end
9+
gem "sqlite3", "~> 1.6", platforms: [:ruby]
1510

1611
gemspec path: "../"

0 commit comments

Comments
 (0)