Update deploy_master.sh and win.sh

This commit is contained in:
Andrea Cavalli 2020-08-18 20:16:17 +02:00
parent ae3d414b45
commit ec5d89604a
2 changed files with 7 additions and 5 deletions

View File

@ -1,7 +1,8 @@
#!/bin/bash -e #!/bin/bash -e
# Setup variables # 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" 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 if [ "$TRAVIS_CPU_ARCH" = "arm64" ]; then

View File

@ -2,6 +2,11 @@
mkdir $TRAVIS_BUILD_DIR/out 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 # Build deps
choco install openjdk11 --version=11.0.8.10 choco install openjdk11 --version=11.0.8.10
choco install maven --version=3.6.3 choco install maven --version=3.6.3
@ -14,10 +19,6 @@ exit 0
choco install gperf choco install gperf
choco install strawberryperl 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 cd $TRAVIS_BUILD_DIR
git clone https://github.com/Microsoft/vcpkg.git git clone https://github.com/Microsoft/vcpkg.git
cd vcpkg cd vcpkg