From d2818865847339210bb9bdf85454f912ac536d6f Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Sat, 4 Jan 2020 15:12:31 -0500 Subject: [PATCH] consolidate Travis CI build jobs --- .travis.yml | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/.travis.yml b/.travis.yml index 20da207be..61df38bfb 100755 --- a/.travis.yml +++ b/.travis.yml @@ -48,21 +48,14 @@ matrix: - sbt -Dsbt.build.version=$SBT_VER universal:packageBin universal:stage integrationTest/test - cd citest && ./test.sh - - name: "build using JDK 8 test using JDK 8" - script: - - sbt -Dsbt.build.version=$SBT_VER universal:packageBin universal:stage integrationTest/test - - cd citest && ./test.sh - - - name: "build using JDK 8, test using OpenJDK 11" - script: - - sbt -Dsbt.build.version=$SBT_VER universal:packageBin universal:stage integrationTest/test - - $JABBA_HOME/bin/jabba install $TRAVIS_JDK11 && export JAVA_HOME="$JABBA_HOME/jdk/$TRAVIS_JDK11" && export PATH="$JAVA_HOME/bin:$PATH" - - java -Xmx32m -version - - cd citest && ./test.sh - - - name: "Linux package testing" + - name: "build using JDK 8 test using JDK 8 and JDK 11" script: - sbt -Dsbt.build.version=$SBT_VER rpm:packageBin debian:packageBin + - sbt -Dsbt.build.version=$SBT_VER universal:packageBin universal:stage integrationTest/test + - cd citest && ./test.sh + - $JABBA_HOME/bin/jabba install $TRAVIS_JDK11 && export JAVA_HOME="$JABBA_HOME/jdk/$TRAVIS_JDK11" && export PATH="$JAVA_HOME/bin:$PATH" + - java -Xmx32m -version + - ./test.sh addons: apt: packages: