Fixed CI settings

Author: Akman

ci/linux/install.sh

@@ -4,14 +4,12 @@
 
 set -ev
 
-# JPACKAGE_JDK_BASE_URL=https://download.java.net/java/GA/jdk14.0.2/205943a0976c4ed48cb16f1043c5c647/12/GPL
-# JPACKAGE_JDK_ARCHIVE_NAME=openjdk-14.0.2_linux-x64_bin.tar.gz
-# JPACKAGE_JDK_HOME=jdk-14.0.2
-# wget -q $JPACKAGE_JDK_BASE_URL/$JPACKAGE_JDK_ARCHIVE_NAME
-# tar xzfp $JPACKAGE_JDK_ARCHIVE_NAME
-# echo "export JPACKAGE_HOME=$(pwd)/$JPACKAGE_JDK_HOME" >> .travis.env
-
-echo "export JPACKAGE_HOME=$JAVA_HOME" >> .travis.env
+JPACKAGE_JDK_BASE_URL=https://download.java.net/java/GA/jdk14.0.2/205943a0976c4ed48cb16f1043c5c647/12/GPL
+JPACKAGE_JDK_ARCHIVE_NAME=openjdk-14.0.2_linux-x64_bin.tar.gz
+JPACKAGE_JDK_HOME=jdk-14.0.2
+wget -q $JPACKAGE_JDK_BASE_URL/$JPACKAGE_JDK_ARCHIVE_NAME
+tar xzfp $JPACKAGE_JDK_ARCHIVE_NAME
+echo "export JPACKAGE_HOME=$(pwd)/$JPACKAGE_JDK_HOME" >> .travis.env
 
 sudo apt-get update -y
 sudo apt-get install -y fakeroot

ci/osx/install.sh

@@ -4,11 +4,9 @@
 
 set -ev
 
-# JPACKAGE_JDK_BASE_URL=https://download.java.net/java/GA/jdk14.0.2/205943a0976c4ed48cb16f1043c5c647/12/GPL
-# JPACKAGE_JDK_ARCHIVE_NAME=openjdk-14.0.2_osx-x64_bin.tar.gz
-# JPACKAGE_JDK_HOME=jdk-14.0.2.jdk/Contents/Home
-# wget -q $JPACKAGE_JDK_BASE_URL/$JPACKAGE_JDK_ARCHIVE_NAME
-# tar xzfp $JPACKAGE_JDK_ARCHIVE_NAME
-# echo "export JPACKAGE_HOME=$(pwd)/$JPACKAGE_JDK_HOME" >> .travis.env
-
-echo "export JPACKAGE_HOME=$JAVA_HOME" >> .travis.env
+JPACKAGE_JDK_BASE_URL=https://download.java.net/java/GA/jdk14.0.2/205943a0976c4ed48cb16f1043c5c647/12/GPL
+JPACKAGE_JDK_ARCHIVE_NAME=openjdk-14.0.2_osx-x64_bin.tar.gz
+JPACKAGE_JDK_HOME=jdk-14.0.2.jdk/Contents/Home
+wget -q $JPACKAGE_JDK_BASE_URL/$JPACKAGE_JDK_ARCHIVE_NAME
+tar xzfp $JPACKAGE_JDK_ARCHIVE_NAME
+echo "export JPACKAGE_HOME=$(pwd)/$JPACKAGE_JDK_HOME" >> .travis.env

ci/windows/install.sh

@@ -18,8 +18,7 @@ echo "export JPACKAGE_HOME=$(pwd)/$JPACKAGE_JDK_HOME" >> .travis.env
 # FeatureIcedTeaWeb	Install IcedTea-Web
 # FeatureJNLPFileRunWith	Associate .jnlp files with IcedTea-web
 # FeatureOracleJavaSoft	Updates registry keys HKLM/SOFTWARE/JavaSoft/
-choco install libericajdk --version 18.0.1 -y -ia ADDLOCAL=FeatureMain,FeatureEnvironment,FeatureJavaHome
-#echo 'export JAVA_HOME="/c/Program Files/AdoptOpenJDK/jdk-16.0.1.9-hotspot"' >> .travis.env
+choco install libericajdk --version 18.0.1 -y -ia --params "/ADDLOCAL=FeatureMain,FeatureEnvironment,FeatureJavaHome"
 echo 'export JAVA_HOME="$JAVA_HOME"' >> .travis.env
 
 # choco install wixtoolset -y