Update .travis.yml and setup_variables.sh
This commit is contained in:
parent
3cffccf5e5
commit
d034c5f49b
@ -7,7 +7,7 @@ os:
|
||||
arch:
|
||||
- amd64
|
||||
- arm64
|
||||
osx_image: xcode10.1
|
||||
osx_image: xcode11.3
|
||||
dist: bionic
|
||||
before_install:
|
||||
- cp .travis.settings.xml $HOME/.m2/settings.xml
|
||||
|
@ -12,9 +12,6 @@ export TDNATIVES_CPP_BUILD_DIR=$TRAVIS_BUILD_DIR/build-tdlib
|
||||
export JAVA_SRC_DIR=$TRAVIS_BUILD_DIR/src/tdlib-java
|
||||
export TDLIB_SERIALIZER_DIR=$TRAVIS_BUILD_DIR/dependencies/tdlib-serializer
|
||||
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_OS_NAME_STANDARD" = "linux" ]; then
|
||||
export TRAVIS_CPU_ARCH_JAVA="${TRAVIS_CPU_ARCH,,}"
|
||||
fi
|
||||
if [ "$TRAVIS_CPU_ARCH" = "arm64" ]; then
|
||||
export TRAVIS_CPU_ARCH_STANDARD="aarch64"
|
||||
export TRAVIS_CPU_CORES="2"
|
||||
@ -49,6 +46,7 @@ elif [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
|
||||
export JAVA_HOME="$(/usr/libexec/java_home -v 11)"
|
||||
export JAVA_INCLUDE_PATH="$(/usr/libexec/java_home -v 11)/include"
|
||||
elif [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
|
||||
export TRAVIS_CPU_ARCH_JAVA="${TRAVIS_CPU_ARCH,,}"
|
||||
export PATH="$PATH:/usr/lib/jvm/java-11-openjdk-$TRAVIS_CPU_ARCH_JAVA/bin"
|
||||
export JAVA_HOME="/usr/lib/jvm/java-11-openjdk-$TRAVIS_CPU_ARCH_JAVA"
|
||||
export JAVA_INCLUDE_PATH="/usr/lib/jvm/java-11-openjdk-$TRAVIS_CPU_ARCH_JAVA/include"
|
||||
|
Loading…
Reference in New Issue
Block a user