From 54e80d75203a41268e66b284ce5422a306107bd0 Mon Sep 17 00:00:00 2001 From: Andrea Date: Wed, 19 Aug 2020 18:14:55 +0200 Subject: [PATCH] Update .travis.yml, deploy_master.sh, and 2 more files... --- .travis.yml | 1 + travis/deploy_master.sh | 1 + travis/linux.sh | 3 ++- travis/win.sh | 1 + 4 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index e46c497..8a4dfb0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -51,6 +51,7 @@ deploy: # script: "mvn -B -V deploy" script: | + set -e if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then bash -e travis/linux.sh && bash -e travis/deploy_master.sh fi diff --git a/travis/deploy_master.sh b/travis/deploy_master.sh index d899250..f0a0030 100644 --- a/travis/deploy_master.sh +++ b/travis/deploy_master.sh @@ -1,4 +1,5 @@ #!/bin/bash -e +set -e # ====== Variables export TD_SRC_DIR=${PWD}/dependencies/tdlight diff --git a/travis/linux.sh b/travis/linux.sh index 38ad6bd..3a74d89 100644 --- a/travis/linux.sh +++ b/travis/linux.sh @@ -1,4 +1,5 @@ #!/bin/bash -e +set -e # ====== Variables export TD_SRC_DIR=${PWD}/dependencies/tdlight @@ -38,7 +39,7 @@ echo "JAVA_INCLUDE_PATH=${JAVA_INCLUDE_PATH}" # ====== Build Td cd $TD_BUILD_DIR cmake -DCMAKE_BUILD_TYPE=Release -DTD_ENABLE_JNI=ON -DCMAKE_INSTALL_PREFIX:PATH=${TD_BIN_DIR} ${TD_SRC_DIR} -cmake --build $TD_BUILD_DIR --target install -- j4 +cmake --build $TD_BUILD_DIR --target install -- -j4 # ====== Build TdNatives cd $TDNATIVES_CPP_BUILD_DIR diff --git a/travis/win.sh b/travis/win.sh index 1f44505..27b285b 100644 --- a/travis/win.sh +++ b/travis/win.sh @@ -1,4 +1,5 @@ #!/bin/bash -e +set -e # ====== Variables export TD_SRC_DIR=${PWD}/dependencies/tdlight