From 163f7329494798c22f1380cffe60d1f8ccb5c1b3 Mon Sep 17 00:00:00 2001 From: Gerben Meijer Date: Wed, 27 Apr 2016 16:19:38 +0200 Subject: [PATCH 1/2] Update travis --- .travis.yml | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3806598..081cd23 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,12 +10,21 @@ script: bundle _${BUNDLER_VERSION}_ exec rspec --color --format documentation notifications: email: false rvm: - - 2.0.0 + - 2.2.3 env: global: - NOKOGIRI_USE_SYSTEM_LIBRARIES=true matrix: - - VAGRANT_VERSION=v1.5.4 BUNDLER_VERSION=1.5.3 - - VAGRANT_VERSION=v1.6.5 BUNDLER_VERSION=1.6.9 - - VAGRANT_VERSION=v1.7.0 BUNDLER_VERSION=1.7.9 - - VAGRANT_VERSION= BUNDLER_VERSION=1.7.9 + - VAGRANT_VERSION=v1.8.1 BUNDLER_VERSION=1.7.9 +matrix: + include: + - env: VAGRANT_VERSION=v1.7.4 BUNDLER_VERSION=1.7.9 + rvm: 2.0.0 + - env: VAGRANT_VERSION=v1.6.5 BUNDLER_VERSION=1.6.9 + rvm: 2.0.0 + - 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 + rvm: 2.2.3 + From d7bcc2c8e0665a1412d9e85639ef6cde6e2a9ae4 Mon Sep 17 00:00:00 2001 From: Gerben Meijer Date: Wed, 27 Apr 2016 16:29:19 +0200 Subject: [PATCH 2/2] Add master to travis builds --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 081cd23..8a51359 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,6 +18,8 @@ env: - VAGRANT_VERSION=v1.8.1 BUNDLER_VERSION=1.7.9 matrix: include: + - env: VAGRANT_VERSION=master BUNDLER_VERSION=1.7.9 + rvm: 2.2.3 - env: VAGRANT_VERSION=v1.7.4 BUNDLER_VERSION=1.7.9 rvm: 2.0.0 - env: VAGRANT_VERSION=v1.6.5 BUNDLER_VERSION=1.6.9