From d6fb73c9d4fc54ba385eef9e8a0683242f928d60 Mon Sep 17 00:00:00 2001
From: Enno Runne <458526+ennru@users.noreply.github.com>
Date: Mon, 25 May 2020 15:35:00 +0200
Subject: [PATCH] Unroll the matrix

---
 .travis.yml          | 41 +++++++++++++++++++++++++----------------
 scripts/test-code.sh |  4 ++++
 2 files changed, 29 insertions(+), 16 deletions(-)
 create mode 100644 scripts/test-code.sh

diff --git a/.travis.yml b/.travis.yml
index f230cbc0b..265f2cf5b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,39 +5,48 @@ language: scala
 git:
   depth: false # Avoid sbt-dynver not seeing the tag
 
-env:
-  matrix:
-    - TRAVIS_JDK=8
-    - TRAVIS_JDK=11
-
-scala:
-  - 2.12.10
-  - 2.13.1
-
 before_install: curl -Ls https://raw.githubusercontent.com/shyiko/jabba/0.11.2/install.sh | bash && . ~/.jabba/jabba.sh
 install: jabba install "adopt@~1.$TRAVIS_JDK.0-0" && jabba use "$_" && java -Xmx32m -version
 
-script:
-  - sbt -DscalaJSStage=full ++$TRAVIS_SCALA_VERSION test publishLocal
-  - sbt ++$TRAVIS_SCALA_VERSION docs/test
-
 jobs:
   include:
     - stage: check
       name: "Code style check. Run locally with: sbt validateCode mimaReportBinaryIssues docs/validateDocs"
       script: sbt validateCode mimaReportBinaryIssues docs/validateDocs
-      scala: 2.13.1
       env:
+        - TRAVIS_SCALA_VERSION=2.13.1
         - TRAVIS_JDK=11
 
     - stage: test
-      # uses the default `script` and Travis Matrix of `scala` and `env matrix`
+      name: "Run tests with Scala 2.12 and AdoptOpenJDK 11"
+      script: scripts/test-code.sh
+      env:
+        - TRAVIS_SCALA_VERSION=2.12.10
+        - TRAVIS_JDK=11
+
+    - name: "Run tests with Scala 2.13 and AdoptOpenJDK 11"
+      script: scripts/test-code.sh
+      env:
+        - TRAVIS_SCALA_VERSION=2.13.1
+        - TRAVIS_JDK=11
+
+    - name: "Run tests with Scala 2.12 and AdoptOpenJDK 8"
+      script: scripts/test-code.sh
+      env:
+        - TRAVIS_SCALA_VERSION=2.12.10
+        - TRAVIS_JDK=8
+
+    - name: "Run tests with Scala 2.13 and AdoptOpenJDK 8"
+      script: scripts/test-code.sh
+      env:
+        - TRAVIS_SCALA_VERSION=2.13.1
+        - TRAVIS_JDK=8
 
     - stage: publish
       name: "TEMPORARY, will become Publish artifacts to Bintray"
       script: sbt +mimaReportBinaryIssues
-      scala: 2.13.1
       env:
+        - TRAVIS_SCALA_VERSION=2.13.1
         - TRAVIS_JDK=11
 
 stages:
diff --git a/scripts/test-code.sh b/scripts/test-code.sh
new file mode 100644
index 000000000..10576783d
--- /dev/null
+++ b/scripts/test-code.sh
@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+
+sbt -DscalaJSStage=full ++$TRAVIS_SCALA_VERSION test publishLocal || exit 1
+sbt ++$TRAVIS_SCALA_VERSION docs/test || exit 1