From e67d4fe0b0c8fe000ea44e4ec1de230d74d40d3f Mon Sep 17 00:00:00 2001
From: Olle Jonsson <olle.jonsson@gmail.com>
Date: Mon, 13 Nov 2017 09:43:22 +0100
Subject: [PATCH] Travis: RVM note, extract env, cache bundler right; Appveyor:
 fix build (#75)

* Travis: RVM note, extract env, cache bundler right

  - RVM does gem update --system on its own
  - put JRUBY_OPTS as env global
  - cache shorthand for bundler corrected

* Travis: use jruby-9.1.14.0 in CI matrix

* AppVeyor script to look more like example
---
 .travis.yml  | 13 ++++++++-----
 appveyor.yml | 27 +++++++++++++++++----------
 2 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 4ab4485..d58bdd4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,9 +1,10 @@
 language: ruby
 cache:
-  - bundler
+  bundler: true
+
 before_install:
-  - gem update --system
   - gem install bundler
+
 bundler_args: --without guard development
 
 matrix:
@@ -12,10 +13,12 @@ matrix:
     - rvm: 2.2.7
     - rvm: 2.3.4
     - rvm: 2.4.1
-    - rvm: jruby-9.1.13.0
+    - rvm: jruby-9.1.14.0
       jdk: oraclejdk8
-      env:
-        - JRUBY_OPTS=--debug
     - rvm: 2.2.7
       install: true # This skips 'bundle install'
       script: gem build rainbow && gem install *.gem
+
+env:
+  global:
+    - JRUBY_OPTS=--debug
diff --git a/appveyor.yml b/appveyor.yml
index 1535489..c98c83c 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -3,27 +3,34 @@
 version: "{build}"
 
 install:
-  - set PATH=C:\Ruby%ruby_version%\bin;%PATH%
-  - gem update --system --no-document
-  - gem install bundler --no-document
-  - bundle install --jobs 3 --retry 3 --without guard development
+  - set PATH=C:\Ruby%RUBY_VERSION%\bin;%PATH%
+  - bundle config --local path vendor/bundle
+  - bundle install --jobs 3 --retry 3 --without guard development 
 
 build: off
 
+cache:
+  - vendor/bundle
+
 init:
   - git config --global core.autocrlf true
 
+before_test:
+  - ruby -v
+  - gem -v
+  - bundle -v
+
 test_script:
   - bundle exec rake
 
 environment:
   matrix:
-    - ruby_version: '21'
-    - ruby_version: 21-x64
-    - ruby_version: '22'
-    - ruby_version: 22-x64
-    - ruby_version: '23'
-    - ruby_version: 23-x64
+    - RUBY_VERSION: 21
+    - RUBY_VERSION: 21-x64
+    - RUBY_VERSION: 22
+    - RUBY_VERSION: 22-x64
+    - RUBY_VERSION: 23
+    - RUBY_VERSION: 23-x64
 
 matrix:
   fast_finish: true