kotovalexarian-likes-github/thoughtbot--factory_bot
1
0
Fork 0
mirror of https://github.com/thoughtbot/factory_bot.git synced 2022-11-09 11:43:51 -05:00
Code Releases Activity

Fix JRuby CI build (#1475)

Browse source 
* 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:
Matijs van Zuijlen 2021-03-30 02:18:27 +02:00 • committed by GitHub
parent 18bbc5b582
commit 131d7791c5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 15 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

3
.travis.yml
View file

@ -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:

6
Appraisals
View file

@ -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
gemfiles/6.0.gemfile
View file

@ -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
gemfiles/6.1.gemfile
View file

@ -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
gemfiles/main.gemfile
View file

@ -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"

9
gemfiles/master.gemfile
View file

@ -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: "../"

8
spec/spec_helper.rb
View file

@ -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|