Fix JRuby CI build (#1475)
* Remove obsolete gemfile * Work around issue with the combination of I18n and JRuby See https://github.com/jruby/jruby/issues/6547 and https://github.com/ruby-i18n/i18n/issues/555 * Use correct released versions of activerecord-jdbcsqlite3-adapter * Require CI to pass on JRuby again * Build on latest JRuby 9.2 version
This commit is contained in:
parent
18bbc5b582
commit
131d7791c5
|
@ -3,7 +3,7 @@ rvm:
|
|||
- 2.6
|
||||
- 2.7
|
||||
- 3.0
|
||||
- jruby-9.2.8.0
|
||||
- jruby-9.2.14.0
|
||||
- ruby-head
|
||||
before_install:
|
||||
- gem update --system
|
||||
|
@ -39,7 +39,6 @@ matrix:
|
|||
gemfile: gemfiles/5.2.gemfile
|
||||
allow_failures:
|
||||
- rvm: ruby-head
|
||||
- rvm: jruby-9.2.8.0
|
||||
- gemfile: gemfiles/main.gemfile
|
||||
branches:
|
||||
only:
|
||||
|
|
|
@ -18,18 +18,18 @@ end
|
|||
|
||||
appraise "6.0" do
|
||||
gem "activerecord", "~> 6.0.0"
|
||||
gem "activerecord-jdbcsqlite3-adapter", "~> 60.0.rc1", platforms: [:jruby]
|
||||
gem "activerecord-jdbcsqlite3-adapter", "~> 60.0", platforms: [:jruby]
|
||||
gem "sqlite3", platforms: [:ruby]
|
||||
end
|
||||
|
||||
appraise "6.1" do
|
||||
gem "activerecord", "~> 6.1.0"
|
||||
gem "activerecord-jdbcsqlite3-adapter", "~> 60.0.rc1", platforms: [:jruby]
|
||||
gem "activerecord-jdbcsqlite3-adapter", "~> 61.0", platforms: [:jruby]
|
||||
gem "sqlite3", platforms: [:ruby]
|
||||
end
|
||||
|
||||
appraise "main" do
|
||||
gem "activerecord", git: "https://github.com/rails/rails.git", branch: "main"
|
||||
gem "activerecord-jdbcsqlite3-adapter", "~> 60.0", platforms: [:jruby]
|
||||
gem "activerecord-jdbcsqlite3-adapter", "~> 61.0", platforms: [:jruby]
|
||||
gem "sqlite3", platforms: [:ruby]
|
||||
end
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
source "https://rubygems.org"
|
||||
|
||||
gem "activerecord-jdbcsqlite3-adapter", "~> 60.0.rc1", platforms: [:jruby]
|
||||
gem "activerecord-jdbcsqlite3-adapter", "~> 60.0", platforms: [:jruby]
|
||||
gem "sqlite3", platforms: [:ruby]
|
||||
gem "activerecord", "~> 6.0.0"
|
||||
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
source "https://rubygems.org"
|
||||
|
||||
gem "activerecord-jdbcsqlite3-adapter", "~> 60.0.rc1", platforms: [:jruby]
|
||||
gem "activerecord-jdbcsqlite3-adapter", "~> 61.0", platforms: [:jruby]
|
||||
gem "sqlite3", platforms: [:ruby]
|
||||
gem "activerecord", "~> 6.1.0"
|
||||
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
source "https://rubygems.org"
|
||||
|
||||
gem "activerecord-jdbcsqlite3-adapter", "~> 60.0", platforms: [:jruby]
|
||||
gem "activerecord-jdbcsqlite3-adapter", "~> 61.0", platforms: [:jruby]
|
||||
gem "sqlite3", platforms: [:ruby]
|
||||
gem "activerecord", git: "https://github.com/rails/rails.git", branch: "main"
|
||||
|
||||
|
|
|
@ -1,9 +0,0 @@
|
|||
# This file was generated by Appraisal
|
||||
|
||||
source "https://rubygems.org"
|
||||
|
||||
gem "activerecord-jdbcsqlite3-adapter", "~> 60.0", platforms: [:jruby]
|
||||
gem "sqlite3", platforms: [:ruby]
|
||||
gem "activerecord", git: "git@github.com:rails/rails.git"
|
||||
|
||||
gemspec name: "factory_bot", path: "../"
|
|
@ -5,6 +5,14 @@ require "simplecov"
|
|||
|
||||
require "factory_bot"
|
||||
|
||||
if RUBY_ENGINE == "jruby"
|
||||
# Workaround for issue in I18n/JRuby combo.
|
||||
# See https://github.com/jruby/jruby/issues/6547 and
|
||||
# https://github.com/ruby-i18n/i18n/issues/555
|
||||
require "i18n/backend"
|
||||
require "i18n/backend/simple"
|
||||
end
|
||||
|
||||
Dir["spec/support/**/*.rb"].each { |f| require File.expand_path(f) }
|
||||
|
||||
RSpec.configure do |config|
|
||||
|
|
Loading…
Reference in New Issue