From 323b095be3fb1813cb675f822caaed3faee70948 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Rodr=C3=ADguez?= <deivid.rodriguez@riseup.net>
Date: Thu, 7 Feb 2019 14:56:24 +0100
Subject: Bump main tested ruby to 2.6.1

---
 .travis.yml | 6 +++---
 Rakefile    | 7 +++++++
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a1ab44d7f1..f8d4c6d8e9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -27,7 +27,7 @@ addons:
       secure: "TrzIv116JLGUxm6PAUskCYrv8KTDguncKROVwbnjVPKTGDAgoDderd8JUdDEXrKoZ9qGLD2TPYKExt9/QDl71E+qHdWnVqWv4HKCUk2P9z/VLKzHuggOUBkCXiJUhjywUieCJhI3N92bfq2EjSBbu2/OFHqWOjLQ+QCooTEBjv8="
 
 rvm:
-  - 2.6.0
+  - 2.6.1
   - 2.5.3
   - 2.4.5
   - 2.3.8
@@ -46,7 +46,7 @@ env:
 
 jobs:
   include:
-    - rvm: 2.6.0
+    - rvm: 2.6.1
       script: rake rubocop
       stage: linting
     # Ruby 2.5, Rubygems 2.7 and up
@@ -75,7 +75,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.0
+    - rvm: 2.6.1
       env: RGV=v2.7.7 BUNDLER_SPEC_SUB_VERSION=1.98
       stage: test
 
diff --git a/Rakefile b/Rakefile
index 21b11b9e59..e8ca39590d 100644
--- a/Rakefile
+++ b/Rakefile
@@ -75,6 +75,13 @@ namespace :spec do
       # Install the gems with a consistent version of RubyGems
       sh "gem update --system 2.6.13"
 
+      # 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"
+        sh "gem install etc:1.0.1 --default"
+        sh "gem install bundler:1.17.2 --default"
+      end
+
       $LOAD_PATH.unshift("./spec")
       require "support/rubygems_ext"
       Spec::Rubygems::DEPS["codeclimate-test-reporter"] = "~> 0.6.0" if RUBY_VERSION >= "2.2.0"
-- 
cgit v1.2.1