Merge pull request #161 from retronym/topic/matrix

Rework build logic to determine which JDK use for release build

Author: retronym

.travis.yml

@@ -2,25 +2,23 @@ language: scala
 sudo: false
 env:
   global:
-    - PUBLISH_JDK=openjdk6 # admin/build.sh only publishes when running on this jdk
 # Don't commit sensitive files, instead commit a version encrypted with $SECRET,
 # this environment variable is encrypted with this repo's private key and stored below:
 # (See http://docs.travis-ci.com/user/environment-variables/#Secure-Variables.)
     - secure: "YO/7YiWEirzz0EAy7oVNmAKroj4qCLZNMkPS+xW/VgeGjuEV+Nk1S7pwxF0o2OggSxIQ+a0lWSrOPQqSXMjOstDIzzGeYfuAt0+0fupXtDDge0mXpCCMadrvYzff1/5XYX0dJ+pjJmz6IgF1hliPJHIuddhhdqPxdHWTHAKm9ME="
 
 script: 
   - admin/build.sh
-scala:
-  - 2.11.8
-  - 2.12.0-RC1 # !!! Duplicated below, edit with care
-jdk:
-  - openjdk6
-  - oraclejdk8
 matrix:
-  exclude:
-
-  - scala: 2.12.0-RC1 # !!! Duplicated above, edit with care  
+  include:
+  - scala: 2.11.8
     jdk: openjdk6
+    env: IS_PUBLISH_JDK=true
+  - scala: 2.11.8
+    jdk: oraclejdk8
+  - scala: 2.12.0-RC1
+    jdk: oraclejdk8
+    env: IS_PUBLISH_JDK=true
 notifications:
   email:
     - [email protected]

admin/build.sh

@@ -5,7 +5,7 @@
 # git on travis does not fetch tags, but we have TRAVIS_TAG
 # headTag=$(git describe --exact-match ||:)
 
-if [ "$TRAVIS_JDK_VERSION" == "$PUBLISH_JDK" ] && [[ "$TRAVIS_TAG" =~ ^v[0-9]+\.[0-9]+\.[0-9]+(-[A-Za-z0-9-]+)? ]]; then
+if [ "$IS_PUBLISH_JDK" == "true" ] && [[ "$TRAVIS_TAG" =~ ^v[0-9]+\.[0-9]+\.[0-9]+(-[A-Za-z0-9-]+)? ]]; then
   echo "Going to release from tag $TRAVIS_TAG!"
   myVer=$(echo $TRAVIS_TAG | sed -e s/^v// | sed -e 's/_[0-9]*\.[0-9]*//')
   publishVersion='set every version := "'$myVer'"'