Set RELEASE_COMBO in the build script

Author: lrytz

Diff for: .travis.yml

@@ -37,9 +37,7 @@ matrix:
     - scala: 2.13.0-M3
       jdk: openjdk6
 
-script:
-  - if [[ "$TRAVIS_JDK_VERSION" == "openjdk6" && "$TRAVIS_SCALA_VERSION" =~ 2\.11\..* || "$TRAVIS_JDK_VERSION" == "oraclejdk8" && "$TRAVIS_SCALA_VERSION" =~ 2\.1[23]\..* ]]; then export RELEASE_COMBO=true; fi
-  - admin/build.sh
+script: admin/build.sh
 
 notifications:
   email: [email protected]

Diff for: admin/README.md

@@ -39,9 +39,7 @@ env:
     # SONA_PASS
     - secure: "XXXXXX"
 
-script:
-  - if [[ "$TRAVIS_JDK_VERSION" == "openjdk6" && "$TRAVIS_SCALA_VERSION" =~ 2\.11\..* || "$TRAVIS_JDK_VERSION" == "oraclejdk8" && "$TRAVIS_SCALA_VERSION" =~ 2\.1[23]\..* ]]; then export RELEASE_COMBO=true; fi
-  - admin/build.sh
+script: admin/build.sh
 
 notifications:
   email:

Diff for: admin/build.sh

@@ -16,6 +16,10 @@ set -e
 # of the existing tag. Then a new tag can be created for that commit, e.g., `v1.2.3#2.13.0-M5`.
 # Everything after the `#` in the tag name is ignored.
 
+if [[ "$TRAVIS_JDK_VERSION" == "openjdk6" && "$TRAVIS_SCALA_VERSION" =~ 2\.11\..* || "$TRAVIS_JDK_VERSION" == "oraclejdk8" && "$TRAVIS_SCALA_VERSION" =~ 2\.1[23]\..* ]]; then
+  RELEASE_COMBO=true;
+fi
+
 if [ "$SCALAJS_VERSION" = "" ]; then
   projectPrefix="xml"
 else