From ec5d89604ad4a38814be7e2320e38c8a41488fe0 Mon Sep 17 00:00:00 2001 From: Andrea Cavalli Date: Tue, 18 Aug 2020 20:16:17 +0200 Subject: [PATCH] Update deploy_master.sh and win.sh --- travis/deploy_master.sh | 3 ++- travis/win.sh | 9 +++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/travis/deploy_master.sh b/travis/deploy_master.sh index c70e769..59ffd76 100644 --- a/travis/deploy_master.sh +++ b/travis/deploy_master.sh @@ -1,7 +1,8 @@ #!/bin/bash -e # Setup variables -export PATH=$PATH:/c/ProgramData/chocolatey/lib/maven/apache-maven-3.6.3/bin:/c/ProgramData/chocolatey/lib/base64/tools +#export PATH="$PATH:/c/Program Files/OpenJDK/openjdk-11.0.8_10/bin:/c/ProgramData/chocolatey/lib/maven/apache-maven-3.6.3/bin:/c/ProgramData/chocolatey/lib/base64/tools" +#export JAVA_HOME="/c/Program Files/OpenJDK/openjdk-11.0.8_10" export MAVEN_OPTS="--add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/sun.nio.ch=ALL-UNNAMED --add-opens java.base/java.lang.reflect=ALL-UNNAMED --add-opens java.base/javax.crypto=ALL-UNNAMED --add-opens java.base/java.io=ALL-UNNAMED" if [ "$TRAVIS_CPU_ARCH" = "arm64" ]; then diff --git a/travis/win.sh b/travis/win.sh index 3534b34..c41b0e4 100644 --- a/travis/win.sh +++ b/travis/win.sh @@ -2,6 +2,11 @@ mkdir $TRAVIS_BUILD_DIR/out +# Setup variables +export PATH="$PATH:/c/Program Files/OpenJDK/openjdk-11.0.8_10/bin:/c/ProgramData/chocolatey/lib/maven/apache-maven-3.6.3/bin:/c/ProgramData/chocolatey/lib/base64/tools" +export JAVA_HOME="/c/Program Files/OpenJDK/openjdk-11.0.8_10" +# End setup variables + # Build deps choco install openjdk11 --version=11.0.8.10 choco install maven --version=3.6.3 @@ -14,10 +19,6 @@ exit 0 choco install gperf choco install strawberryperl -# Setup variables -export PATH=$PATH:/c/ProgramData/chocolatey/lib/maven/apache-maven-3.6.3/bin:/c/ProgramData/chocolatey/lib/base64/tools -# End setup variables - cd $TRAVIS_BUILD_DIR git clone https://github.com/Microsoft/vcpkg.git cd vcpkg