summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Rodríguez <deivid.rodriguez@riseup.net>2019-03-14 16:42:20 +0100
committerDavid Rodríguez <deivid.rodriguez@riseup.net>2019-03-26 12:51:32 +0100
commitae7830749fab8d7a28a602eb32f6bbe8838d48f4 (patch)
tree5c99b6fc981bca1c156ae536b6d4d9acd9f4899f
parent6f39ea5b15d61e5bdf7915bc94d66c31b1242d15 (diff)
downloadbundler-ae7830749fab8d7a28a602eb32f6bbe8838d48f4.tar.gz
Bump to MRI 2.6.2
-rw-r--r--.travis.yml6
-rw-r--r--Rakefile6
2 files changed, 5 insertions, 7 deletions
diff --git a/.travis.yml b/.travis.yml
index 2e90164fe8..9970f59421 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -28,7 +28,7 @@ addons:
secure: "TrzIv116JLGUxm6PAUskCYrv8KTDguncKROVwbnjVPKTGDAgoDderd8JUdDEXrKoZ9qGLD2TPYKExt9/QDl71E+qHdWnVqWv4HKCUk2P9z/VLKzHuggOUBkCXiJUhjywUieCJhI3N92bfq2EjSBbu2/OFHqWOjLQ+QCooTEBjv8="
rvm:
- - 2.6.1
+ - 2.6.2
- 2.5.3
- 2.4.5
- 2.3.8
@@ -47,7 +47,7 @@ env:
jobs:
include:
- - rvm: 2.6.1
+ - rvm: 2.6.2
script: rake rubocop
stage: linting
# Ruby 2.5, Rubygems 2.7
@@ -67,7 +67,7 @@ jobs:
env: RGV=master
stage: test
# 1.x mode (we want to keep stuff passing in 1.x mode for now)
- - rvm: 2.6.1
+ - rvm: 2.6.2
env: RGV=v3.0.3 BUNDLER_SPEC_SUB_VERSION=1.98
stage: test
diff --git a/Rakefile b/Rakefile
index d64e9cc789..0f455f4652 100644
--- a/Rakefile
+++ b/Rakefile
@@ -77,11 +77,9 @@ namespace :spec do
# Install the gems with a consistent version of RubyGems
sh "gem update --system 3.0.3"
- # Fix incorrect default gem specifications on ruby 2.6.1. Can be removed
- # when 2.6.2 is released and we start testing against it
- if RUBY_VERSION == "2.6.1"
+ # Fix incorrect default etc gem specification file list on ruby 2.6.2.
+ if RUBY_VERSION == "2.6.2"
sh "gem install etc:1.0.1 --default"
- sh "gem install bundler:1.17.2 --default"
end
$LOAD_PATH.unshift("./spec")