1
0
Fork 0

Update Jenkinsfile and compile.sh

This commit is contained in:
Andrea Cavalli 2020-10-03 15:27:48 +02:00
parent 3a7ec4511d
commit f2d0c42cc1
2 changed files with 2 additions and 6 deletions

2
Jenkinsfile vendored
View File

@ -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
}
}

View File

@ -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