diff options
| author | The Bundler Bot <bot@bundler.io> | 2017-12-28 02:30:37 +0000 |
|---|---|---|
| committer | Colby Swandale <hello@colby.fyi> | 2018-07-10 23:02:44 +1000 |
| commit | 4ce6e3946942dae7b2d0eacf272021c6df0cadc8 (patch) | |
| tree | c2b7acc86de46f2caa75fa9edf26e6169928c23e | |
| parent | 38e66d37f83b412aed9d4856a7a2e2b1d75de704 (diff) | |
| download | bundler-4ce6e3946942dae7b2d0eacf272021c6df0cadc8.tar.gz | |
Auto merge of #6226 - bundler:seg-travis-2-5, r=segiddins
[Travis] Test against Ruby 2.5
The problem was Ruby 2.5 was released yesterday! So this updates Bundler to test against it on CI, as well as acknowledging 2.6 as a new minor.
(cherry picked from commit ab14bb1938d70cbe76a1fe1ddba64a84cee5a847)
| -rw-r--r-- | .travis.yml | 7 | ||||
| -rw-r--r-- | Rakefile | 2 | ||||
| -rw-r--r-- | lib/bundler/current_ruby.rb | 1 |
3 files changed, 6 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml index 61adb2a39b..322ec069c5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,8 +29,9 @@ addons: secure: "TrzIv116JLGUxm6PAUskCYrv8KTDguncKROVwbnjVPKTGDAgoDderd8JUdDEXrKoZ9qGLD2TPYKExt9/QDl71E+qHdWnVqWv4HKCUk2P9z/VLKzHuggOUBkCXiJUhjywUieCJhI3N92bfq2EjSBbu2/OFHqWOjLQ+QCooTEBjv8=" rvm: - - 2.4.1 - - 2.3.4 + - 2.5.1 + - 2.4.3 + - 2.3.6 - 2.2.7 - 2.1.10 - 2.0.0 @@ -42,7 +43,7 @@ env: # We need to know if changes to rubygems will break bundler on release - RGV=master # Test the latest rubygems release with all of our supported rubies - - RGV=v2.6.8 + - RGV=v2.7.4 matrix: include: @@ -144,7 +144,7 @@ begin rubyopt = ENV["RUBYOPT"] # When editing this list, also edit .travis.yml! branches = %w[master] - releases = %w[v1.3.6 v1.3.7 v1.4.2 v1.5.3 v1.6.2 v1.7.2 v1.8.29 v2.0.14 v2.1.11 v2.2.5 v2.4.8 v2.5.2 v2.6.8] + releases = %w[v1.3.6 v1.3.7 v1.4.2 v1.5.3 v1.6.2 v1.7.2 v1.8.29 v2.0.14 v2.1.11 v2.2.5 v2.4.8 v2.5.2 v2.6.8 v2.6.14 v2.7.4] (branches + releases).each do |rg| desc "Run specs with RubyGems #{rg}" RSpec::Core::RakeTask.new(rg) do |t| diff --git a/lib/bundler/current_ruby.rb b/lib/bundler/current_ruby.rb index 31532d108d..220d638b87 100644 --- a/lib/bundler/current_ruby.rb +++ b/lib/bundler/current_ruby.rb @@ -18,6 +18,7 @@ module Bundler 2.3 2.4 2.5 + 2.6 ].freeze KNOWN_MAJOR_VERSIONS = KNOWN_MINOR_VERSIONS.map {|v| v.split(".", 2).first }.uniq.freeze |