From feb0f2119e00311e151af054b2265226e1c68e5d Mon Sep 17 00:00:00 2001 From: Olle Jonsson Date: Mon, 7 Jan 2019 13:59:11 +0100 Subject: [PATCH 1/6] CI: Include Ruby 2.6.0 in build matrix --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 785041a8..cb5080e3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,6 +9,7 @@ rvm: - 2.3.7 - 2.4.4 - 2.5.1 + - 2.6 before_script: - git config --global user.email "travis@travis.ci" @@ -16,7 +17,7 @@ before_script: before_install: - gem update --system - - gem install bundler + - gem install bundler:'< 2' script: - bundle exec rspec From 11d8fc6c390bbe4741956db71ee41ddb5d30e271 Mon Sep 17 00:00:00 2001 From: Olle Jonsson Date: Mon, 7 Jan 2019 14:08:22 +0100 Subject: [PATCH 2/6] AppVeyor: Bundler less than 2 --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index e1873591..a54e12a0 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -39,7 +39,7 @@ install: - where gem # Install latest Bundler to work around version issues - - gem install bundler --force + - gem install bundler:'< 2' --force - where bundler # Install ruby dependencies From 5ecaec546b6180fde3c80725ffda9339c86b185f Mon Sep 17 00:00:00 2001 From: Olle Jonsson Date: Mon, 7 Jan 2019 14:09:34 +0100 Subject: [PATCH 3/6] AppVeyor: Extend the CI matrix --- appveyor.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index a54e12a0..d46cb4e5 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -8,7 +8,12 @@ environment: - RUBY_FOLDER_VERSION: "22-x64" - RUBY_FOLDER_VERSION: "23" - RUBY_FOLDER_VERSION: "23-x64" - + - RUBY_FOLDER_VERSION: "24" + - RUBY_FOLDER_VERSION: "24-x64" + - RUBY_FOLDER_VERSION: "25" + - RUBY_FOLDER_VERSION: "25-x64" + - RUBY_FOLDER_VERSION: "26" + - RUBY_FOLDER_VERSION: "26-x64" matrix: fast_finish: true From 1af73dc5677e25358355788fafef2d4b7f8b6910 Mon Sep 17 00:00:00 2001 From: Olle Jonsson Date: Tue, 8 Jan 2019 13:20:08 +0100 Subject: [PATCH 4/6] CI: Make an exception for ruby-2.2 --- .travis.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index cb5080e3..66526a25 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,7 +16,13 @@ before_script: - git config --global user.name "Travis CI" before_install: - - gem update --system + - | + export RVM_CURRENT=`rvm current` + if [ "${RVM_CURRENT}" != "ruby-2.2.7" ]; then + gem --version + else + gem update --system + fi - gem install bundler:'< 2' script: From 28840b168ba7a50f4107cbb21c4a1da43e5fccd8 Mon Sep 17 00:00:00 2001 From: Olle Jonsson Date: Tue, 8 Jan 2019 13:21:50 +0100 Subject: [PATCH 5/6] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 66526a25..51d51fd6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,7 +18,7 @@ before_script: before_install: - | export RVM_CURRENT=`rvm current` - if [ "${RVM_CURRENT}" != "ruby-2.2.7" ]; then + if [ "${RVM_CURRENT}" == "ruby-2.2.7" ]; then gem --version else gem update --system From d3a471e74aac6bb22499b99b9222dbe13b08e92e Mon Sep 17 00:00:00 2001 From: Olle Jonsson Date: Tue, 8 Jan 2019 13:37:21 +0100 Subject: [PATCH 6/6] CI: rvm current|cut -c6-8 - This is to make an exception for Ruby 2.2.x --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 51d51fd6..52fd354d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,8 +17,8 @@ before_script: before_install: - | - export RVM_CURRENT=`rvm current` - if [ "${RVM_CURRENT}" == "ruby-2.2.7" ]; then + export RVM_CURRENT=`rvm current|cut -c6-8` + if [ "${RVM_CURRENT}" == "2.2" ]; then gem --version else gem update --system