💚 Try to upgrade Travis env. and fix build

puniverse · Jun 20, 2016 · ed2e58d · ed2e58d
1 parent 7d4712f
commit ed2e58d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,8 +2,17 @@ language: java
 sudo: required
 dist: trusty
 before_install:
+  - export JAVA_VER=$(java -version 2>&1 | sed 's/java version "\(.*\)\.\(.*\)\..*"/\1\2/; 1q')
+  - echo ${JAVA_VER}
   - sudo chmod a+x travis/pre_build.sh
   - ./travis/pre_build.sh
+  - if [[ ${JAVA_VER} == "18" ]]; then jdk_switcher use oraclejdk8; fi
+  - if [[ ${JAVA_VER} == "18" ]]; then export JAVA_HOME=/usr/lib/jvm/java-8-oracle; fi
+  - echo ${JAVA_HOME}
+  - java -version
+  - javac -version
+  - javah -version
+
 install: GRADLE_OPTS="-XX:MaxPermSize=512m" gradle -q assemble
 script: GRADLE_OPTS="-XX:MaxPermSize=512m" gradle -i check
 jdk:

diff --git a/travis/pre_build.sh b/travis/pre_build.sh
@@ -1,24 +1,15 @@
 #!/bin/bash
 start=$(date +%s)
 
-export JAVA_VER=$(java -version 2>&1 | sed 's/java version "\(.*\)\.\(.*\)\..*"/\1\2/; 1q')
-echo ${JAVA_VER}
-
 if [[ ${JAVA_VER} == "18" ]]; then
     ls -al /usr/lib/jvm
     sudo apt-get -y remove --purge oracle-java8-installer*
     sudo rm -rf /usr/lib/jvm/jdk1.8.0* /usr/lib/jvm/java-8-oracle* /usr/lib/jvm/.java-8-oracle* /usr/lib/jvm/default-java
     ls -al /usr/lib/jvm
     sudo apt-get -y update
     sudo apt-get -y install oracle-java8-installer
-    ls -al /usr/lib/jvm
     sudo ln -s /usr/lib/jvm/java-8-oracle /usr/lib/jvm/default-java
-    jdk_switcher use oraclejdk8
-    export JAVA_HOME=/usr/lib/jvm/java-8-oracle
-    echo ${JAVA_HOME}
-    java -version
-    javac -version
-    javah -version
+    ls -al /usr/lib/jvm
 fi
 
 end=$(date +%s)