Merge pull request #545 from splitrb/fix-travis-build

Update travis config and add Ruby 2.6.0
splitrb · Jan 10, 2019 · d293fcf · d293fcf
2 parents 0d6622d + b80aac0
commit d293fcf
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 13 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,11 +2,12 @@ language: ruby
 rvm:
   - 1.9.3
   - 2.0
-  - 2.1
+  - 2.1.10
   - 2.2.0
   - 2.2.2
-  - 2.4.3
-  - 2.5.1
+  - 2.4.5
+  - 2.5.3
+  - 2.6.0
 
 gemfile:
   - gemfiles/4.2.gemfile
@@ -21,30 +22,30 @@ matrix:
     gemfile: gemfiles/5.0.gemfile
   - rvm: 1.9.3
     gemfile: gemfiles/5.1.gemfile
+  - rvm: 1.9.3
+    gemfile: gemfiles/5.2.gemfile
   - rvm: 2.0
     gemfile: gemfiles/5.0.gemfile
   - rvm: 2.0
     gemfile: gemfiles/5.1.gemfile
-  - rvm: 2.1
+  - rvm: 2.0
+    gemfile: gemfiles/5.2.gemfile
+  - rvm: 2.1.10
     gemfile: gemfiles/5.0.gemfile
-  - rvm: 2.1
+  - rvm: 2.1.10
     gemfile: gemfiles/5.1.gemfile
+  - rvm: 2.1.10
+    gemfile: gemfiles/5.2.gemfile
   - rvm: 2.2.0
     gemfile: gemfiles/5.0.gemfile
   - rvm: 2.2.0
     gemfile: gemfiles/5.1.gemfile
-  - rvm: 1.9.3
-    gemfile: gemfiles/5.2.gemfile
-  - rvm: 2.0
-    gemfile: gemfiles/5.2.gemfile
-  - rvm: 2.1
-    gemfile: gemfiles/5.2.gemfile
   - rvm: 2.2.0
     gemfile: gemfiles/5.2.gemfile
 
 
 before_install:
-  - gem update --system && gem install bundler
+  - gem install bundler --version=1.17.3
 
 script:
   - RAILS_ENV=test bundle exec rake spec && bundle exec codeclimate-test-reporter

diff --git a/split.gemspec b/split.gemspec
@@ -34,7 +34,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'sinatra',         '>= 1.2.6'
   s.add_dependency 'simple-random',   '>= 0.9.3'
 
-  s.add_development_dependency 'bundler',     '~> 1.14'
+  s.add_development_dependency 'bundler',     '>= 1.17'
   s.add_development_dependency 'simplecov',   '~> 0.15'
   s.add_development_dependency 'rack-test',   '~> 0.6'
   s.add_development_dependency 'rake',        '~> 12'