From 933f4605e45741e9befecdb7806b5ee81263fef6 Mon Sep 17 00:00:00 2001
From: Dave <dave@2a1b.com>
Date: Fri, 11 Jan 2019 19:33:21 +1300
Subject: [PATCH 1/2] Fix bundler versions for different versions of ruby.

---
 .travis.yml | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 4eda05aa..a9a8ac55 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,17 +7,26 @@ env:
     - PATH=/opt/local/bin:$PATH
     - TESTOPTS="-v"
     - TINYTDS_UNIT_HOST=localhost
-rvm:
-  - 2.1.9
-  - 2.2.5
-  - 2.3.1
+matrix:
+  include:
+    - os: linux
+      rvm: 2.1.9
+      install:
+        - gem install bundler -v '<2'
+    - os: linux
+      rvm: 2.2.5
+      install:
+        - gem install bundler -v '<2'
+    - os: linux
+      rvm: 2.3.1
+      install:
+        - gem install bundler
 before_install:
   - docker info
   - sudo ./test/bin/install-openssl.sh
   - sudo ./test/bin/install-freetds.sh
   - sudo ./test/bin/setup.sh
 install:
-  - gem install bundler
   - bundle --version
   - bundle install
 script:

From 64b2292937a06513954cf82dbca1844fb1722880 Mon Sep 17 00:00:00 2001
From: Dave <dave@2a1b.com>
Date: Fri, 11 Jan 2019 20:52:09 +1300
Subject: [PATCH 2/2] Move bundle install into matrix so build works correctly.

---
 .travis.yml | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a9a8ac55..45afecfc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,21 +13,24 @@ matrix:
       rvm: 2.1.9
       install:
         - gem install bundler -v '<2'
+        - bundle --version
+        - bundle install
     - os: linux
       rvm: 2.2.5
       install:
         - gem install bundler -v '<2'
+        - bundle --version
+        - bundle install
     - os: linux
       rvm: 2.3.1
       install:
         - gem install bundler
+        - bundle --version
+        - bundle install
 before_install:
   - docker info
   - sudo ./test/bin/install-openssl.sh
   - sudo ./test/bin/install-freetds.sh
   - sudo ./test/bin/setup.sh
-install:
-  - bundle --version
-  - bundle install
 script:
   - bundle exec rake