Skip to content

Commit 1e47698

Browse files
aried3rgauravtiwari
authored andcommitted
Fix Travis CI builds (#2098)
* 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. #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.
1 parent 40987fe commit 1e47698

9 files changed

+19
-32
lines changed

.travis.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ cache:
2222

2323
install:
2424
- bundle install
25-
- nvm install node
25+
- nvm install 10
2626
- node -v
2727
- npm i -g yarn
2828
- yarn
@@ -33,7 +33,8 @@ script:
3333
- bundle exec rake test
3434
matrix:
3535
allow_failures:
36-
- gemfile: gemfiles/Gemfile-rails-edge
36+
- gemfile: gemfiles/Gemfile-rails-edge
37+
- rvm: ruby-head
3738
exclude:
3839
- rvm: 2.3.8
3940
gemfile: gemfiles/Gemfile-rails-edge

Gemfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ gemspec
44

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

109
group :test do

Gemfile.lock

Lines changed: 11 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,3 @@
1-
GIT
2-
remote: https://github.com/rubocop-hq/rubocop.git
3-
revision: dc69686abf10d9f38ed3a39037fab76ae8874138
4-
specs:
5-
rubocop (0.65.0)
6-
jaro_winkler (~> 1.5.1)
7-
parallel (~> 1.10)
8-
parser (>= 2.5, != 2.5.1.1)
9-
powerpack (~> 0.1)
10-
psych (>= 3.1.0)
11-
rainbow (>= 2.2.2, < 4.0)
12-
ruby-progressbar (~> 1.7)
13-
unicode-display_width (~> 1.4.0)
14-
151
PATH
162
remote: .
173
specs:
@@ -91,11 +77,9 @@ GEM
9177
nio4r (2.3.1)
9278
nokogiri (1.10.1)
9379
mini_portile2 (~> 2.4.0)
94-
parallel (1.14.0)
95-
parser (2.6.0.0)
80+
parallel (1.17.0)
81+
parser (2.6.3.0)
9682
ast (~> 2.4.0)
97-
powerpack (0.1.2)
98-
psych (3.1.0)
9983
rack (2.0.6)
10084
rack-proxy (0.6.5)
10185
rack
@@ -127,6 +111,13 @@ GEM
127111
thor (>= 0.19.0, < 2.0)
128112
rainbow (3.0.0)
129113
rake (12.3.2)
114+
rubocop (0.68.1)
115+
jaro_winkler (~> 1.5.1)
116+
parallel (~> 1.10)
117+
parser (>= 2.5, != 2.5.1.1)
118+
rainbow (>= 2.2.2, < 4.0)
119+
ruby-progressbar (~> 1.7)
120+
unicode-display_width (>= 1.4.0, < 1.6)
130121
ruby-progressbar (1.10.0)
131122
sprockets (3.7.2)
132123
concurrent-ruby (~> 1.0)
@@ -139,7 +130,7 @@ GEM
139130
thread_safe (0.3.6)
140131
tzinfo (1.2.5)
141132
thread_safe (~> 0.1)
142-
unicode-display_width (1.4.1)
133+
unicode-display_width (1.5.0)
143134
websocket-driver (0.7.0)
144135
websocket-extensions (>= 0.1.0)
145136
websocket-extensions (0.1.3)
@@ -154,7 +145,7 @@ DEPENDENCIES
154145
rack-proxy
155146
rails
156147
rake (>= 11.1)
157-
rubocop!
148+
rubocop (< 0.69)
158149
webpacker!
159150

160151
BUNDLED WITH

gemfiles/Gemfile-rails-edge

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ gem "webpacker", path: ".."
77
gem "rails", github: "rails/rails"
88
gem "arel", github: "rails/arel"
99
gem "rake", ">= 11.1"
10-
gem "rubocop", git: "https://github.com/rubocop-hq/rubocop.git", require: false
1110
gem "rack-proxy", require: false
1211
gem "minitest", "~> 5.0"
1312
gem "byebug"

gemfiles/Gemfile-rails.4.2.x

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
source "https://rubygems.org"
22

3-
gem "webpacker", path: ".."
3+
gemspec path: "../"
44

55
gem "rails", "~> 4.2.0"
66
gem "rake", ">= 11.1"
7-
gem "rubocop", git: "https://github.com/rubocop-hq/rubocop.git", require: false
87
gem "rack-proxy", require: false
98
gem "minitest", "~> 5.0"
109
gem "byebug"

gemfiles/Gemfile-rails.5.0.x

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
source "https://rubygems.org"
22

3-
gem "webpacker", path: ".."
3+
gemspec path: "../"
44

55
gem "rails", "~> 5.0.0"
66
gem "rake", ">= 11.1"
7-
gem "rubocop", git: "https://github.com/rubocop-hq/rubocop.git", require: false
87
gem "rack-proxy", require: false
98
gem "minitest", "~> 5.0"
109
gem "byebug"

gemfiles/Gemfile-rails.5.1.x

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
source "https://rubygems.org"
22

3-
gem "webpacker", path: ".."
3+
gemspec path: "../"
44

55
gem "rails", "~> 5.1.0"
66
gem "rake", ">= 11.1"
7-
gem "rubocop", git: "https://github.com/rubocop-hq/rubocop.git", require: false
87
gem "rack-proxy", require: false
98
gem "minitest", "~> 5.0"
109
gem "byebug"

gemfiles/Gemfile-rails.5.2.x

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
source "https://rubygems.org"
22

3-
gem "webpacker", path: ".."
3+
gemspec path: "../"
44

55
gem "rails", "~> 5.2.0"
66
gem "rake", ">= 11.1"
7-
gem "rubocop", git: "https://github.com/rubocop-hq/rubocop.git", require: false
87
gem "rack-proxy", require: false
98
gem "minitest", "~> 5.0"
109
gem "byebug"

webpacker.gemspec

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ Gem::Specification.new do |s|
2222
s.add_dependency "rack-proxy", ">= 0.6.1"
2323

2424
s.add_development_dependency "bundler", "~> 1.12"
25+
s.add_development_dependency "rubocop", "< 0.69"
2526

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

0 commit comments

Comments
 (0)