Update Jenkinsfile and setup_variables.sh
This commit is contained in:
parent
5aded78e90
commit
b513ef9da5
2
Jenkinsfile
vendored
2
Jenkinsfile
vendored
@ -24,7 +24,7 @@ pipeline {
|
|||||||
agent {
|
agent {
|
||||||
docker {
|
docker {
|
||||||
image 'dockcross/linux-x64'
|
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
|
reuseNode false
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -5,7 +5,6 @@ set -e
|
|||||||
export TRAVIS_CPU_ARCH="amd64"
|
export TRAVIS_CPU_ARCH="amd64"
|
||||||
export TRAVIS_OS_NAME="linux"
|
export TRAVIS_OS_NAME="linux"
|
||||||
export TRAVIS_BUILD_DIR="/workdir/tdlight-java"
|
export TRAVIS_BUILD_DIR="/workdir/tdlight-java"
|
||||||
export JAVA_HOME="/java"
|
|
||||||
|
|
||||||
# ====== Variables
|
# ====== Variables
|
||||||
export TD_SRC_DIR=$TRAVIS_BUILD_DIR/dependencies/tdlight
|
export TD_SRC_DIR=$TRAVIS_BUILD_DIR/dependencies/tdlight
|
||||||
@ -65,7 +64,6 @@ elif [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
# ====== Print variables
|
# ====== Print variables
|
||||||
echo "JAVA_HOME=${JAVA_HOME}"
|
|
||||||
echo "TD_SRC_DIR=${TD_SRC_DIR}"
|
echo "TD_SRC_DIR=${TD_SRC_DIR}"
|
||||||
echo "TD_BIN_DIR=${TD_BIN_DIR}"
|
echo "TD_BIN_DIR=${TD_BIN_DIR}"
|
||||||
echo "TDNATIVES_BIN_DIR=${TDNATIVES_BIN_DIR}"
|
echo "TDNATIVES_BIN_DIR=${TDNATIVES_BIN_DIR}"
|
||||||
|
Loading…
Reference in New Issue
Block a user