From f2d0c42cc141d818ba5702bd26b07d74d3a75017 Mon Sep 17 00:00:00 2001 From: Andrea Cavalli Date: Sat, 3 Oct 2020 15:27:48 +0200 Subject: [PATCH] Update Jenkinsfile and compile.sh --- Jenkinsfile | 2 +- jenkins/scripts/compile.sh | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 96d3aed..1a53138 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -24,7 +24,7 @@ pipeline { agent { docker { image 'dockcross/linux-x64' - args '-v $JAVA_HOME:/java -v $HOME:/var/maven' + args '-v $JAVA_HOME:/java -v $HOME:/var/maven -v $HOME:/work' reuseNode true } } diff --git a/jenkins/scripts/compile.sh b/jenkins/scripts/compile.sh index 4e37562..dd81f9e 100755 --- a/jenkins/scripts/compile.sh +++ b/jenkins/scripts/compile.sh @@ -7,15 +7,11 @@ source ./jenkins/scripts/setup_variables.sh # ====== Setup workspace bash ./jenkins/scripts/setup_workspace.sh - -docker run --rm dockcross/linux-x64 > ./dockcross-linux-x64 -chmod +x ./dockcross-linux-x64 - # ====== Build Td # Prepare build cd $TD_BUILD_DIR if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then - ./dockcross-linux-x64 --args "-v $JAVA_HOME:/java" cmake -DCMAKE_BUILD_TYPE=Release -DTD_ENABLE_JNI=ON -DCMAKE_INSTALL_PREFIX:PATH=${TD_BIN_DIR} -DTD_SKIP_BENCHMARK=ON -DTD_SKIP_TEST=OFF -DTD_SKIP_TG_CLI=ON ${TD_SRC_DIR} + cmake -DCMAKE_BUILD_TYPE=Release -DTD_ENABLE_JNI=ON -DCMAKE_INSTALL_PREFIX:PATH=${TD_BIN_DIR} -DTD_SKIP_BENCHMARK=ON -DTD_SKIP_TEST=OFF -DTD_SKIP_TG_CLI=ON ${TD_SRC_DIR} elif [[ "$TRAVIS_OS_NAME" == "osx" ]]; then cmake -DCMAKE_BUILD_TYPE=Release -DTD_ENABLE_JNI=ON -DCMAKE_INSTALL_PREFIX:PATH=${TD_BIN_DIR} -DTD_SKIP_BENCHMARK=ON -DTD_SKIP_TEST=OFF -DTD_SKIP_TG_CLI=ON -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl/ ${TD_SRC_DIR} elif [[ "$TRAVIS_OS_NAME" == "windows" ]]; then