Update .travis.yml, deploy_master.sh, and 2 more files...
This commit is contained in:
parent
931a24c377
commit
8076af5cf4
15
.travis.yml
15
.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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user