Update .travis.yml and linux.sh

This commit is contained in:
Andrea Cavalli 2020-08-18 22:05:46 +02:00
parent bf7b349d13
commit e40eed0800
2 changed files with 3 additions and 3 deletions

View File

@ -49,7 +49,7 @@ deploy:
script: |
if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
bash -e travis/linux.sh && bash -e travis/deploy_master.sh
travis_wait 30 bash -e travis/linux.sh && bash -e travis/deploy_master.sh
fi
if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then

View File

@ -20,14 +20,14 @@ cd jnibuild
#export JAVA_HOME=/usr/lib/jvm/java-1.13.0-openjdk-amd64
#export JAVA_INCLUDE_PATH=/usr/lib/jvm/java-1.13.0-openjdk-amd64/include/
cmake -DCMAKE_BUILD_TYPE=Release -DTD_ENABLE_JNI=ON -DCMAKE_INSTALL_PREFIX:PATH=${TD_BIN_DIR} ${TD_SRC_DIR}
travis_wait 30 cmake --build . --target install -- -j4
cmake --build . --target install -- -j4
cd ../../../../../
#mvn install -X
cd src/main/jni/jtdlib/build
cmake -DCMAKE_BUILD_TYPE=Release -DTd_DIR=${TD_BIN_DIR}/lib/cmake/Td -DJAVA_SRC_DIR=${JAVA_SRC_DIR} -DCMAKE_INSTALL_PREFIX:PATH=.. ..
travis_wait 30 cmake --build . --target install -- -j4
cmake --build . --target install -- -j4
cd ..
#rm -r jnibuild
#rm -r build