Skip to content

Commit

Permalink
Fix Travis CI builds (#2098)
Browse files Browse the repository at this point in the history
* Temporarily fix Travis CI builds

`nvm install node` will install the latest node version, which is 12 as
of writing. Because of a problem in the resolved node-sass version this
makes the builds fail.

To get green builds until a proper fix for node 12 is introduced we'll
install node 10, which is a LTS release, while 11 will be EOL in June
2019.

@rokumatsumoto is maybe working on a fix, but I think green builds,
especially for third party PRs are an important intermediate step.

rails/webpacker#2077
sass/node-sass#2633
nodejs/nan#849
https://github.com/nodejs/Release

* Lock RuboCop to a version that supports Ruby 2.2

RuboCop 0.69.0 dropped support for Ruby 2.2, making RuboCop fail when it
was installed since it pointed to the git repo instead of a specific
version.

https://github.com/rubocop-hq/rubocop/blob/v0.69.0/CHANGELOG.md#changes

* Allow failures with ruby-head

These might – currently – not be related to Ruby itself, but to the
fact that bundler 2.1.0.pre.1 was installed, which is as of writing
not supported by webpacker (`~> 1.12` is used).

But this is to get the CI builds green again.
  • Loading branch information
KingTiger001 committed May 22, 2019
1 parent 89b8b05 commit 9d12b0f
Show file tree
Hide file tree
Showing 9 changed files with 19 additions and 32 deletions.
5 changes: 3 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ cache:

install:
- bundle install
- nvm install node
- nvm install 10
- node -v
- npm i -g yarn
- yarn
Expand All @@ -33,7 +33,8 @@ script:
- bundle exec rake test
matrix:
allow_failures:
- gemfile: gemfiles/Gemfile-rails-edge
- gemfile: gemfiles/Gemfile-rails-edge
- rvm: ruby-head
exclude:
- rvm: 2.3.8
gemfile: gemfiles/Gemfile-rails-edge
Expand Down
1 change: 0 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ gemspec

gem "rails"
gem "rake", ">= 11.1"
gem "rubocop", git: "https://github.com/rubocop-hq/rubocop.git", require: false
gem "rack-proxy", require: false

group :test do
Expand Down
31 changes: 11 additions & 20 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,17 +1,3 @@
GIT
remote: https://github.com/rubocop-hq/rubocop.git
revision: dc69686abf10d9f38ed3a39037fab76ae8874138
specs:
rubocop (0.65.0)
jaro_winkler (~> 1.5.1)
parallel (~> 1.10)
parser (>= 2.5, != 2.5.1.1)
powerpack (~> 0.1)
psych (>= 3.1.0)
rainbow (>= 2.2.2, < 4.0)
ruby-progressbar (~> 1.7)
unicode-display_width (~> 1.4.0)

PATH
remote: .
specs:
Expand Down Expand Up @@ -91,11 +77,9 @@ GEM
nio4r (2.3.1)
nokogiri (1.10.1)
mini_portile2 (~> 2.4.0)
parallel (1.14.0)
parser (2.6.0.0)
parallel (1.17.0)
parser (2.6.3.0)
ast (~> 2.4.0)
powerpack (0.1.2)
psych (3.1.0)
rack (2.0.6)
rack-proxy (0.6.5)
rack
Expand Down Expand Up @@ -127,6 +111,13 @@ GEM
thor (>= 0.19.0, < 2.0)
rainbow (3.0.0)
rake (12.3.2)
rubocop (0.68.1)
jaro_winkler (~> 1.5.1)
parallel (~> 1.10)
parser (>= 2.5, != 2.5.1.1)
rainbow (>= 2.2.2, < 4.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 1.4.0, < 1.6)
ruby-progressbar (1.10.0)
sprockets (3.7.2)
concurrent-ruby (~> 1.0)
Expand All @@ -139,7 +130,7 @@ GEM
thread_safe (0.3.6)
tzinfo (1.2.5)
thread_safe (~> 0.1)
unicode-display_width (1.4.1)
unicode-display_width (1.5.0)
websocket-driver (0.7.0)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.3)
Expand All @@ -154,7 +145,7 @@ DEPENDENCIES
rack-proxy
rails
rake (>= 11.1)
rubocop!
rubocop (< 0.69)
webpacker!

BUNDLED WITH
Expand Down
1 change: 0 additions & 1 deletion gemfiles/Gemfile-rails-edge
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ gem "webpacker", path: ".."
gem "rails", github: "rails/rails"
gem "arel", github: "rails/arel"
gem "rake", ">= 11.1"
gem "rubocop", git: "https://github.com/rubocop-hq/rubocop.git", require: false
gem "rack-proxy", require: false
gem "minitest", "~> 5.0"
gem "byebug"
3 changes: 1 addition & 2 deletions gemfiles/Gemfile-rails.4.2.x
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
source "https://rubygems.org"

gem "webpacker", path: ".."
gemspec path: "../"

gem "rails", "~> 4.2.0"
gem "rake", ">= 11.1"
gem "rubocop", git: "https://github.com/rubocop-hq/rubocop.git", require: false
gem "rack-proxy", require: false
gem "minitest", "~> 5.0"
gem "byebug"
3 changes: 1 addition & 2 deletions gemfiles/Gemfile-rails.5.0.x
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
source "https://rubygems.org"

gem "webpacker", path: ".."
gemspec path: "../"

gem "rails", "~> 5.0.0"
gem "rake", ">= 11.1"
gem "rubocop", git: "https://github.com/rubocop-hq/rubocop.git", require: false
gem "rack-proxy", require: false
gem "minitest", "~> 5.0"
gem "byebug"
3 changes: 1 addition & 2 deletions gemfiles/Gemfile-rails.5.1.x
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
source "https://rubygems.org"

gem "webpacker", path: ".."
gemspec path: "../"

gem "rails", "~> 5.1.0"
gem "rake", ">= 11.1"
gem "rubocop", git: "https://github.com/rubocop-hq/rubocop.git", require: false
gem "rack-proxy", require: false
gem "minitest", "~> 5.0"
gem "byebug"
3 changes: 1 addition & 2 deletions gemfiles/Gemfile-rails.5.2.x
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
source "https://rubygems.org"

gem "webpacker", path: ".."
gemspec path: "../"

gem "rails", "~> 5.2.0"
gem "rake", ">= 11.1"
gem "rubocop", git: "https://github.com/rubocop-hq/rubocop.git", require: false
gem "rack-proxy", require: false
gem "minitest", "~> 5.0"
gem "byebug"
1 change: 1 addition & 0 deletions webpacker.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ Gem::Specification.new do |s|
s.add_dependency "rack-proxy", ">= 0.6.1"

s.add_development_dependency "bundler", "~> 1.12"
s.add_development_dependency "rubocop", "< 0.69"

s.files = `git ls-files`.split("\n")
s.test_files = `git ls-files -- test/*`.split("\n")
Expand Down

0 comments on commit 9d12b0f

Please sign in to comment.