From 6e40e20129b7a5a2e0e2f684d5a7bc90fee6062f Mon Sep 17 00:00:00 2001 From: Andrea Cavalli Date: Sat, 3 Oct 2020 15:17:37 +0200 Subject: [PATCH] Update Jenkinsfile and compile.sh --- Jenkinsfile | 5 +++++ jenkins/scripts/compile.sh | 6 +++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index aeb93bf..c99de90 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -12,6 +12,11 @@ pipeline { args '-v $HOME:/var/maven' reuseNode true } + docker { + image 'dockcross/linux-x64' + args '-v $JAVA_HOME:/java' + reuseNode true + } } triggers { pollSCM "* * * * *" diff --git a/jenkins/scripts/compile.sh b/jenkins/scripts/compile.sh index dd81f9e..4e37562 100755 --- a/jenkins/scripts/compile.sh +++ b/jenkins/scripts/compile.sh @@ -7,11 +7,15 @@ 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 - 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} + ./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} 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