From dbf196f88001721331a6f44d46be9479dbc4239f Mon Sep 17 00:00:00 2001
From: Nepomuk Seiler <nepomuk.seiler@mukis.de>
Date: Mon, 17 Jul 2017 19:54:57 +0200
Subject: [PATCH] Explicitly include all the different envs in travis

---
 .travis.yml | 64 +++++++++++++++++++++++++++++++++--------------------
 1 file changed, 40 insertions(+), 24 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 47756fdf6..317a6a27b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,38 +1,54 @@
 language: java
 os: linux
-jdk: oraclejdk8
-
-env:
-  - SBT_TEST_CMD="validate"
-  - SBT_TEST_CMD="++2.12.2 ^^1.0.0-M6 validate"
-  - SBT_TEST_CMD="validateUniversal"
-  - SBT_TEST_CMD="++2.12.2 ^^1.0.0-M6 validateUniversal"
-  - SBT_TEST_CMD="validateJar"
-  - SBT_TEST_CMD="++2.12.2 ^^1.0.0-M6 validateJar"
-  - SBT_TEST_CMD="validateBash"
-  - SBT_TEST_CMD="++2.12.2 ^^1.0.0-M6 validateBash"
-  - SBT_TEST_CMD="validateAsh"
-  - SBT_TEST_CMD="++2.12.2 ^^1.0.0-M6 validateAsh"
-  - SBT_TEST_CMD="validateRpm"
-  - SBT_TEST_CMD="++2.12.2 ^^1.0.0-M6 validateRpm"
-  - SBT_TEST_CMD="validateDebian"
-  - SBT_TEST_CMD="++2.12.2 ^^1.0.0-M6 validateDebian"
-  # for now we can't test the docker image generation on travis
-  - SBT_TEST_CMD="validateDockerUnit"
-  - SBT_TEST_CMD="++2.12.2 ^^1.0.0-M6 validateDockerUnit"
-  # jdk packaging is only available on jdk8+
-  - SBT_TEST_CMD="validateJdkPackager"
-  - SBT_TEST_CMD="++2.12.2 ^^1.0.0-M6 validateJdkPackager"
 
 before_install:
   - if [[ "$TRAVIS_OS_NAME" = "osx" ]]; then
       brew update;
       brew install xz;
     fi
-script: ./sbt "$SBT_TEST_CMD" ;
+script: ./sbt "$SBT_TEST_CMD";
 
+# We explicitly set the matrix to include oraclejdk8 because MacOS X has issues. See comment below
 matrix:
   include:
+    - jdk: oraclejdk8
+      env: SBT_TEST_CMD="validate"
+    - jdk: oraclejdk8
+      env: SBT_TEST_CMD="++2.12.2 ^^1.0.0-M6 validate"
+    - jdk: oraclejdk8
+      env: SBT_TEST_CMD="validateUniversal"
+    - jdk: oraclejdk8
+      env: SBT_TEST_CMD="++2.12.2 ^^1.0.0-M6 validateUniversal"
+    - jdk: oraclejdk8
+      env: SBT_TEST_CMD="validateJar"
+    - jdk: oraclejdk8
+      env: SBT_TEST_CMD="++2.12.2 ^^1.0.0-M6 validateJar"
+    - jdk: oraclejdk8
+      env: SBT_TEST_CMD="validateBash"
+    - jdk: oraclejdk8
+      env: SBT_TEST_CMD="++2.12.2 ^^1.0.0-M6 validateBash"
+    - jdk: oraclejdk8
+      env: SBT_TEST_CMD="validateAsh"
+    - jdk: oraclejdk8
+      env: SBT_TEST_CMD="++2.12.2 ^^1.0.0-M6 validateAsh"
+    - jdk: oraclejdk8
+      env: SBT_TEST_CMD="validateRpm"
+    - jdk: oraclejdk8
+      env: SBT_TEST_CMD="++2.12.2 ^^1.0.0-M6 validateRpm"
+    - jdk: oraclejdk8
+      env: SBT_TEST_CMD="validateDebian"
+    - jdk: oraclejdk8
+      env: SBT_TEST_CMD="++2.12.2 ^^1.0.0-M6 validateDebian"
+      # for now we can't test the docker image generation on travis
+    - jdk: oraclejdk8
+      env: SBT_TEST_CMD="validateDockerUnit"
+    - jdk: oraclejdk8
+      env: SBT_TEST_CMD="++2.12.2 ^^1.0.0-M6 validateDockerUnit"
+      # jdk packaging is only available on jdk8+
+    - jdk: oraclejdk8
+      env: SBT_TEST_CMD="validateJdkPackager"
+    - jdk: oraclejdk8
+      env: SBT_TEST_CMD="++2.12.2 ^^1.0.0-M6 validateJdkPackager"
       # oraclejdk8 is not yet available.
       # see https://github.com/travis-ci/travis-ci/issues/2316
     - os: osx