1
0
Fork 0

Update Jenkinsfile and setup_variables.sh

This commit is contained in:
Andrea Cavalli 2020-10-03 16:21:46 +02:00
parent 5aded78e90
commit b513ef9da5
2 changed files with 1 additions and 3 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 -v \"${env.WORKSPACE}:/workdir\""
args "-v $JAVA_HOME:$JAVA_HOME -v $HOME:/var/maven -v \"${env.WORKSPACE}:/workdir\""
reuseNode false
}
}

View File

@ -5,7 +5,6 @@ set -e
export TRAVIS_CPU_ARCH="amd64"
export TRAVIS_OS_NAME="linux"
export TRAVIS_BUILD_DIR="/workdir/tdlight-java"
export JAVA_HOME="/java"
# ====== Variables
export TD_SRC_DIR=$TRAVIS_BUILD_DIR/dependencies/tdlight
@ -65,7 +64,6 @@ elif [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
fi
# ====== Print variables
echo "JAVA_HOME=${JAVA_HOME}"
echo "TD_SRC_DIR=${TD_SRC_DIR}"
echo "TD_BIN_DIR=${TD_BIN_DIR}"
echo "TDNATIVES_BIN_DIR=${TDNATIVES_BIN_DIR}"