Skip to content

Commit

Permalink
Update rails versions on Travis
Browse files Browse the repository at this point in the history
This commit gets the Travis build passing by:

* Removing Rails 4.2 so we don't have to deal with bundler < 2 anymore
* Bumping to latests Rails versions
* Explicitly listing all gems that appear in the default Rails Gemfile
  • Loading branch information
composerinteralia committed Mar 28, 2020
1 parent 39ada50 commit 40ee56d
Show file tree
Hide file tree
Showing 6 changed files with 68 additions and 79 deletions.
4 changes: 0 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
language: ruby
env:
- ARUBA_TIMEOUT=240
before_install:
- gem update --system
- rvm @default,@global do gem uninstall bundler -v 2.0.2 -x
cache: bundler
rvm:
- 2.3
Expand All @@ -17,7 +14,6 @@ branches:
install:
- "bundle install --retry 3 --jobs 8"
gemfile:
- gemfiles/rails4.2.gemfile
- gemfiles/rails5.0.gemfile
- gemfiles/rails5.1.gemfile
- gemfiles/rails5.2.gemfile
Expand Down
61 changes: 34 additions & 27 deletions Appraisals
Original file line number Diff line number Diff line change
@@ -1,14 +1,9 @@
# These are the versions of Rails we want to test against.
appraise "rails4.2" do
gem "rails", "~> 4.2.11"
gem "sqlite3", "~> 1.3.6"
end

appraise "rails5.0" do
gem "activerecord", "~> 5.0.7"
gem "railties", "~> 5.0.7"
gem "activerecord", "~> 5.0.7.2"
gem "railties", "~> 5.0.7.2"
gem "sqlite3", "~> 1.3.6"
gem "actionmailer", "~> 5.0.7"
gem "actionmailer", "~> 5.0.7.2"
gem "sass-rails"
end

Expand All @@ -20,28 +15,40 @@ appraise "rails5.1" do
end

appraise "rails5.2" do
gem "activerecord", "~> 5.2.3"
gem "railties", "~> 5.2.3"
gem "actionmailer", "~> 5.2.3"
gem "bootsnap"
gem "activestorage", "~> 5.2.3"
gem "sass-rails"
gem "bootsnap", ">= 1.1.0", require: false
gem "byebug", platforms: :ruby
gem "capybara", ">= 2.15"
gem "chromedriver-helper"
gem "coffee-rails", "~> 4.2"
gem "jbuilder", "~> 2.5"
gem "puma", "~> 3.11"
gem "rails", "~> 5.2.4", ">= 5.2.4.2"
gem "sass-rails", "~> 5.0"
gem "selenium-webdriver"
gem "sqlite3", "~> 1.3.6", platforms: :ruby
gem "turbolinks", "~> 5"
gem "uglifier", ">= 1.3.0"
gem "listen", ">= 3.0.5", "< 3.2"
gem "spring"
gem "spring-watcher-listen", "~> 2.0.0"
gem "web-console", ">= 3.3.0", group: :development
end

appraise "rails6.0" do
gem "rails", "~> 6.0.0"
gem "bootsnap"
gem "byebug"
gem "capybara"
gem "jbuilder"
gem "listen", "~> 3.1.5"
gem "puma", "~> 3.11"
gem "sass-rails", "~> 5"
gem "bootsnap", ">= 1.4.2", require: false
gem "byebug", platforms: :ruby
gem "capybara", ">= 2.15"
gem "jbuilder", "~> 2.7"
gem "puma", "~> 4.1"
gem "rails", "~> 6.0.2", ">= 6.0.2.2"
gem "sass-rails", ">= 6"
gem "selenium-webdriver"
gem "spring"
gem "spring-watcher-listen"
gem "turbolinks"
gem "web-console", group: :development
gem "sqlite3", "~> 1.4", platforms: :ruby
gem "turbolinks", "~> 5"
gem "webdrivers"
gem "webpacker"
gem "webpacker", "~> 4.0"
gem "listen", ">= 3.0.5", "< 3.2"
gem "spring"
gem "spring-watcher-listen", "~> 2.0.0"
gem "web-console", ">= 3.3.0", group: :development
end
22 changes: 0 additions & 22 deletions gemfiles/rails4.2.gemfile

This file was deleted.

6 changes: 3 additions & 3 deletions gemfiles/rails5.0.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ gem "jruby-openssl", platforms: :jruby
gem "therubyrhino", platforms: :jruby
gem "sqlite3", "~> 1.3.6"
gem "rubocop", "0.54", require: false
gem "activerecord", "~> 5.0.7"
gem "railties", "~> 5.0.7"
gem "actionmailer", "~> 5.0.7"
gem "activerecord", "~> 5.0.7.2"
gem "railties", "~> 5.0.7.2"
gem "actionmailer", "~> 5.0.7.2"
gem "sass-rails"

gemspec name: "factory_bot_rails", path: "../"
26 changes: 17 additions & 9 deletions gemfiles/rails5.2.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,24 +4,32 @@ source "https://rubygems.org"

gem "appraisal"
gem "aruba"
gem "coffee-rails"
gem "coffee-rails", "~> 4.2"
gem "cucumber", "1.3.19"
gem "jquery-rails"
gem "rake"
gem "rspec-rails"
gem "test-unit"
gem "uglifier"
gem "uglifier", ">= 1.3.0"
gem "activerecord-jdbcsqlite3-adapter", platforms: :jruby
gem "jdbc-sqlite3", platforms: :jruby
gem "jruby-openssl", platforms: :jruby
gem "therubyrhino", platforms: :jruby
gem "sqlite3", platforms: :ruby
gem "sqlite3", "~> 1.3.6", platforms: :ruby
gem "rubocop", "0.54", require: false
gem "activerecord", "~> 5.2.3"
gem "railties", "~> 5.2.3"
gem "actionmailer", "~> 5.2.3"
gem "bootsnap"
gem "activestorage", "~> 5.2.3"
gem "sass-rails"
gem "bootsnap", ">= 1.1.0", require: false
gem "byebug", platforms: :ruby
gem "capybara", ">= 2.15"
gem "chromedriver-helper"
gem "jbuilder", "~> 2.5"
gem "puma", "~> 3.11"
gem "rails", "~> 5.2.4", ">= 5.2.4.2"
gem "sass-rails", "~> 5.0"
gem "selenium-webdriver"
gem "turbolinks", "~> 5"
gem "listen", ">= 3.0.5", "< 3.2"
gem "spring"
gem "spring-watcher-listen", "~> 2.0.0"
gem "web-console", ">= 3.3.0", group: :development

gemspec name: "factory_bot_rails", path: "../"
28 changes: 14 additions & 14 deletions gemfiles/rails6.0.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,22 +15,22 @@ gem "activerecord-jdbcsqlite3-adapter", platforms: :jruby
gem "jdbc-sqlite3", platforms: :jruby
gem "jruby-openssl", platforms: :jruby
gem "therubyrhino", platforms: :jruby
gem "sqlite3", platforms: :ruby
gem "sqlite3", "~> 1.4", platforms: :ruby
gem "rubocop", "0.54", require: false
gem "rails", "~> 6.0.0"
gem "bootsnap"
gem "byebug"
gem "capybara"
gem "jbuilder"
gem "listen", "~> 3.1.5"
gem "puma", "~> 3.11"
gem "sass-rails", "~> 5"
gem "bootsnap", ">= 1.4.2", require: false
gem "byebug", platforms: :ruby
gem "capybara", ">= 2.15"
gem "jbuilder", "~> 2.7"
gem "puma", "~> 4.1"
gem "rails", "~> 6.0.2", ">= 6.0.2.2"
gem "sass-rails", ">= 6"
gem "selenium-webdriver"
gem "spring"
gem "spring-watcher-listen"
gem "turbolinks"
gem "web-console", group: :development
gem "turbolinks", "~> 5"
gem "webdrivers"
gem "webpacker"
gem "webpacker", "~> 4.0"
gem "listen", ">= 3.0.5", "< 3.2"
gem "spring"
gem "spring-watcher-listen", "~> 2.0.0"
gem "web-console", ">= 3.3.0", group: :development

gemspec name: "factory_bot_rails", path: "../"

0 comments on commit 40ee56d

Please sign in to comment.