From 5a421526857f9160aeac7ae136ec0d00d539e4b1 Mon Sep 17 00:00:00 2001
From: Hiroshi SHIBATA <hsbt@ruby-lang.org>
Date: Thu, 27 Feb 2020 17:20:34 +0900
Subject: Run with BUNDLER_SPEC_SUB_VERSION

---
 .github/workflows/ubuntu.yml |  2 ++
 .travis.yml                  | 22 ----------------------
 2 files changed, 2 insertions(+), 22 deletions(-)

diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
index 14f17b747f..a75d088973 100644
--- a/.github/workflows/ubuntu.yml
+++ b/.github/workflows/ubuntu.yml
@@ -15,6 +15,7 @@ jobs:
       matrix:
         ruby: [ 2.3.8, 2.4.9, 2.5.7, 2.6.5 ]
         rgv: [ master, v3.0.6 ]
+        bundler_version: [ 2.2.0.dev 3.0.0 ]
     steps:
       - uses: actions/checkout@v1
       - name: Setup ruby
@@ -31,6 +32,7 @@ jobs:
         run: bin/parallel_rspec spec
         env:
           RGV: ${{ matrix.rgv }}
+          BUNDLER_SPEC_SUB_VERSION: ${{ matrix.bundler_version }}
       - name: Run Test with realworld
         run: |
           bin/rake spec:realworld
diff --git a/.travis.yml b/.travis.yml
index 4bcbe51a4c..8db0203889 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -32,47 +32,25 @@ notifications:
     rooms:
       - secure: JxBi7DDJGkIF/7f/FSN/HUHpvV4EKfQccZHTPd1b2pNJn3GXo6u+tNVbAw2WjxYzPyPQI3ZcYBCU9SEXp/i7VmG8uMzh8Kyildw+miSKYKVb90uYqcsXWzbxwyNBgJLvyDkzST45H5lgnyAicee3WkFes/WDZikIajbH7ztdb04=
 
-rvm:
-  - 2.6.5
-  - 2.5.7
-  - 2.4.9
-
-stages:
-  - test
-
-env:
-  # We need to know if changes to rubygems will break bundler on release
-  - RGV=master BUNDLER_SPEC_SUB_VERSION=3.0.0
-  - RGV=master
-  # Test the latest rubygems release with all of our supported rubies
-  - RGV=v3.0.6 BUNDLER_SPEC_SUB_VERSION=3.0.0
-  - RGV=v3.0.6
-
 jobs:
   include:
     # Ruby 2.3 also tested in 2.x mode
     - rvm: 2.3.8
       env: RGV=master
-      stage: test
     - rvm: 2.3.8
       env: RGV=v3.0.6
-      stage: test
     # Ruby 2.5, Rubygems 2.7
     - rvm: 2.5.7
       env: RGV=v2.7.10
-      stage: test
     # Ruby 2.4, Rubygems 2.6
     - rvm: 2.4.9
       env: RGV=v2.6.14
-      stage: test
     # Ruby 2.3, Rubygems 2.5
     - rvm: 2.3.8
       env: RGV=v2.5.2
-      stage: test
     # Ruby-head (we want to know how we're doing, but not fail the build)
     - rvm: ruby-head
       env: RGV=master
-      stage: test
 
   allow_failures:
     - rvm: ruby-head
-- 
cgit v1.2.1