Skip to content

Commit afd2003

Browse files
author
Andrés Riveros
committed
bundler 2 and rails 4.2 conflict
1 parent 5fd39c1 commit afd2003

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

.travis.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ language: ruby
22

33
env:
44
- "RAILS_VERSION=4.2"
5-
- "RAILS_VERSION=5.1"
5+
- "RAILS_VERSION=5.2"
66
- "RAILS_VERSION=master"
77

88
rvm:
9-
- 2.3.6
10-
- 2.4.3
11-
- 2.5.0
9+
- 2.3.8
10+
- 2.4.5
11+
- 2.5.3
1212

1313
matrix:
1414
fast_finish: true
@@ -19,7 +19,8 @@ matrix:
1919
env: RAILS_VERSION=4.2
2020

2121
before_install:
22-
- gem update bundler
22+
- gem uninstall -v '>= 2' -i $(rvm gemdir)@global -ax bundler || true
23+
- gem install bundler -v '< 2'
2324

2425
before_script:
2526
- bundle exec rake app:db:setup

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ rails = case rails_version
99
when "master"
1010
{github: "rails/rails"}
1111
when "default"
12-
"~> 5.1"
12+
"~> 5.2"
1313
else
1414
"~> #{rails_version}"
1515
end

0 commit comments

Comments
 (0)