From b2d710d9594aa8e2094fd7ddddbc91cd0b641023 Mon Sep 17 00:00:00 2001
From: Jason Zaman <jason@perfinion.com>
Date: Mon, 21 May 2018 15:44:08 +0800
Subject: [PATCH] travis.yml: add ruby 2.5 to the test matrix

Ruby 2.5 is not installed by default, force reinstall with rvm

Signed-off-by: Jason Zaman <jason@perfinion.com>
Acked-by: Nicolas Iooss <nicolas.iooss@m4x.org>
---
 .travis.yml | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 63c7a544..823af7ec 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,29 +11,30 @@ compiler:
 env:
   matrix:
     # Test the last version of Python and Ruby together, with some linkers
-    - PYVER=python3.6 RUBYLIBVER=2.4
-    - PYVER=python3.6 RUBYLIBVER=2.4 TEST_FLAGS_OVERRIDE=1
-    - PYVER=python3.6 RUBYLIBVER=2.4 LINKER=gold
-    - PYVER=python3.6 RUBYLIBVER=2.4 LINKER=bfd
+    - PYVER=python3.6 RUBYLIBVER=2.5.1
+    - PYVER=python3.6 RUBYLIBVER=2.5.1 TEST_FLAGS_OVERRIDE=1
+    - PYVER=python3.6 RUBYLIBVER=2.5.1 LINKER=gold
+    - PYVER=python3.6 RUBYLIBVER=2.5.1 LINKER=bfd
 
     # Test several Python versions
-    - PYVER=python2.7 RUBYLIBVER=2.4
-    - PYVER=python3.3 RUBYLIBVER=2.4
-    - PYVER=python3.4 RUBYLIBVER=2.4
-    - PYVER=python3.5 RUBYLIBVER=2.4
-    - PYVER=pypy RUBYLIBVER=2.4
-    - PYVER=pypy3 RUBYLIBVER=2.4
+    - PYVER=python2.7 RUBYLIBVER=2.5.1
+    - PYVER=python3.3 RUBYLIBVER=2.5.1
+    - PYVER=python3.4 RUBYLIBVER=2.5.1
+    - PYVER=python3.5 RUBYLIBVER=2.5.1
+    - PYVER=pypy RUBYLIBVER=2.5.1
+    - PYVER=pypy3 RUBYLIBVER=2.5.1
 
     # Test several Ruby versions
-    - PYVER=python3.6 RUBYLIBVER=2.2
+    - PYVER=python3.6 RUBYLIBVER=2.4
     - PYVER=python3.6 RUBYLIBVER=2.3
+    - PYVER=python3.6 RUBYLIBVER=2.2
 
 matrix:
   exclude:
     - compiler: clang
-      env: PYVER=python3.6 RUBYLIBVER=2.4 LINKER=gold
+      env: PYVER=python3.6 RUBYLIBVER=2.5.1 LINKER=gold
     - compiler: clang
-      env: PYVER=python3.6 RUBYLIBVER=2.4 LINKER=bfd
+      env: PYVER=python3.6 RUBYLIBVER=2.5.1 LINKER=bfd
 
 # Use Travis-CI Ubuntu 14.04 Trusty infrastructure, "full image" variant
 sudo: required
@@ -98,6 +99,7 @@ before_script:
   - if echo "$PYVER" | grep -q pypy ; then export PYINC=-I$($PYTHON -c 'import sys;print(sys.prefix)')/include PYLIBS= ; fi
 
   # Find the Ruby executable with version $RUBYLIBVER
+  - rvm reinstall ruby-$RUBYLIBVER --binary
   - export RUBY="$(ls -d -1 "$HOME/.rvm/rubies/ruby-$RUBYLIBVER"*/bin/ruby | head -n 1)"
 
   # Set the linker in $CC so that it gets used everywhere