Skip to content

Commit d293fcf

Browse files
authored
Merge pull request #545 from splitrb/fix-travis-build
Update travis config and add Ruby 2.6.0
2 parents 0d6622d + b80aac0 commit d293fcf

File tree

2 files changed

+14
-13
lines changed

2 files changed

+14
-13
lines changed

.travis.yml

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,12 @@ language: ruby
22
rvm:
33
- 1.9.3
44
- 2.0
5-
- 2.1
5+
- 2.1.10
66
- 2.2.0
77
- 2.2.2
8-
- 2.4.3
9-
- 2.5.1
8+
- 2.4.5
9+
- 2.5.3
10+
- 2.6.0
1011

1112
gemfile:
1213
- gemfiles/4.2.gemfile
@@ -21,30 +22,30 @@ matrix:
2122
gemfile: gemfiles/5.0.gemfile
2223
- rvm: 1.9.3
2324
gemfile: gemfiles/5.1.gemfile
25+
- rvm: 1.9.3
26+
gemfile: gemfiles/5.2.gemfile
2427
- rvm: 2.0
2528
gemfile: gemfiles/5.0.gemfile
2629
- rvm: 2.0
2730
gemfile: gemfiles/5.1.gemfile
28-
- rvm: 2.1
31+
- rvm: 2.0
32+
gemfile: gemfiles/5.2.gemfile
33+
- rvm: 2.1.10
2934
gemfile: gemfiles/5.0.gemfile
30-
- rvm: 2.1
35+
- rvm: 2.1.10
3136
gemfile: gemfiles/5.1.gemfile
37+
- rvm: 2.1.10
38+
gemfile: gemfiles/5.2.gemfile
3239
- rvm: 2.2.0
3340
gemfile: gemfiles/5.0.gemfile
3441
- rvm: 2.2.0
3542
gemfile: gemfiles/5.1.gemfile
36-
- rvm: 1.9.3
37-
gemfile: gemfiles/5.2.gemfile
38-
- rvm: 2.0
39-
gemfile: gemfiles/5.2.gemfile
40-
- rvm: 2.1
41-
gemfile: gemfiles/5.2.gemfile
4243
- rvm: 2.2.0
4344
gemfile: gemfiles/5.2.gemfile
4445

4546

4647
before_install:
47-
- gem update --system && gem install bundler
48+
- gem install bundler --version=1.17.3
4849

4950
script:
5051
- RAILS_ENV=test bundle exec rake spec && bundle exec codeclimate-test-reporter

split.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ Gem::Specification.new do |s|
3434
s.add_dependency 'sinatra', '>= 1.2.6'
3535
s.add_dependency 'simple-random', '>= 0.9.3'
3636

37-
s.add_development_dependency 'bundler', '~> 1.14'
37+
s.add_development_dependency 'bundler', '>= 1.17'
3838
s.add_development_dependency 'simplecov', '~> 0.15'
3939
s.add_development_dependency 'rack-test', '~> 0.6'
4040
s.add_development_dependency 'rake', '~> 12'

0 commit comments

Comments
 (0)