From ffe92cede3967dea6de637ca4bd2bb007fbbc912 Mon Sep 17 00:00:00 2001 From: Gerben Meijer Date: Thu, 16 Jun 2016 14:57:53 +0200 Subject: [PATCH 1/3] Use latest Vagrant release with travis --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 8a51359..5763817 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,7 +15,7 @@ env: global: - NOKOGIRI_USE_SYSTEM_LIBRARIES=true matrix: - - VAGRANT_VERSION=v1.8.1 BUNDLER_VERSION=1.7.9 + - VAGRANT_VERSION=v1.8.4 BUNDLER_VERSION=1.7.9 matrix: include: - env: VAGRANT_VERSION=master BUNDLER_VERSION=1.7.9 From 7fc5ae7e0f226c065e9f8b7fa0373435a6c71404 Mon Sep 17 00:00:00 2001 From: Gerben Meijer Date: Thu, 16 Jun 2016 15:01:50 +0200 Subject: [PATCH 2/3] Set bundler in travis to match Vagrants (1.12.5) --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5763817..0e4cac4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,7 +15,7 @@ env: global: - NOKOGIRI_USE_SYSTEM_LIBRARIES=true matrix: - - VAGRANT_VERSION=v1.8.4 BUNDLER_VERSION=1.7.9 + - VAGRANT_VERSION=v1.8.4 BUNDLER_VERSION=1.12.5 matrix: include: - env: VAGRANT_VERSION=master BUNDLER_VERSION=1.7.9 @@ -27,6 +27,6 @@ matrix: - env: VAGRANT_VERSION=v1.5.4 BUNDLER_VERSION=1.5.3 rvm: 2.0.0 allow_failures: - - env: VAGRANT_VERSION=master BUNDLER_VERSION=1.7.9 + - env: VAGRANT_VERSION=master BUNDLER_VERSION=1.12.5 rvm: 2.2.3 From a839b6f940d917b4c6f02e12e2a2b4dad62464c3 Mon Sep 17 00:00:00 2001 From: Gerben Meijer Date: Thu, 16 Jun 2016 15:03:55 +0200 Subject: [PATCH 3/3] Fixup for travis bundler version --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 0e4cac4..4edd218 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,7 +18,7 @@ env: - VAGRANT_VERSION=v1.8.4 BUNDLER_VERSION=1.12.5 matrix: include: - - env: VAGRANT_VERSION=master BUNDLER_VERSION=1.7.9 + - env: VAGRANT_VERSION=master BUNDLER_VERSION=1.12.5 rvm: 2.2.3 - env: VAGRANT_VERSION=v1.7.4 BUNDLER_VERSION=1.7.9 rvm: 2.0.0