From 8076af5cf407bd5380efe850f5fa52d747cf09bd Mon Sep 17 00:00:00 2001 From: Andrea Cavalli Date: Tue, 18 Aug 2020 18:41:38 +0200 Subject: [PATCH] Update .travis.yml, deploy_master.sh, and 2 more files... --- .travis.yml | 15 +++++++++++++++ travis/deploy_master.sh | 1 - travis/linux.sh | 4 ++-- travis/win.sh | 1 + 4 files changed, 18 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 096609b..a380f87 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,6 +4,21 @@ os: - linux - windows osx_image: xcode10.1 +dist: bionic +addons: + apt: + packages: + - make + - git + - zlib1g-dev + - libssl-dev + - gperf + - php + - cmake + - default-jdk + - g++ + - ccache + - maven arch: - amd64 diff --git a/travis/deploy_master.sh b/travis/deploy_master.sh index 7c40415..9f816f6 100644 --- a/travis/deploy_master.sh +++ b/travis/deploy_master.sh @@ -1,7 +1,6 @@ #!/bin/bash -e # Setup variables -sudo apt install maven 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/linux.sh b/travis/linux.sh index 9607edf..9c052a9 100644 --- a/travis/linux.sh +++ b/travis/linux.sh @@ -5,9 +5,9 @@ mkdir $TRAVIS_BUILD_DIR/out touch "$TRAVIS_BUILD_DIR/out/libtdjni.so" exit 0 -sudo apt-get update +#sudo apt-get update #sudo apt-get upgrade -sudo apt-get install make git zlib1g-dev libssl-dev gperf php cmake default-jdk g++ ccache +#sudo apt-get install make git zlib1g-dev libssl-dev gperf php cmake default-jdk g++ ccache maven cd src/main/jni diff --git a/travis/win.sh b/travis/win.sh index caab3c3..61de2e4 100644 --- a/travis/win.sh +++ b/travis/win.sh @@ -9,6 +9,7 @@ exit 0 choco install gperf choco install strawberryperl choco install openjdk11 +choco install maven cd $TRAVIS_BUILD_DIR git clone https://github.com/Microsoft/vcpkg.git