tdlight-team/tdlight-java-natives-linux-amd64
1
0
Fork 0
Code Releases Activity

Update dockerfile and setup_variables.sh

Browse Source
This commit is contained in:
Andrea Cavalli 2020-10-04 14:15:02 +02:00
parent 135e22cb85
commit caa8ed0a95
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
jenkins/docker/dockerfile
View File

@ -32,7 +32,17 @@ RUN mkdir /output
WORKDIR /work WORKDIR /work
RUN export JAVA_HOME=/usr/lib/jvm/zulu15 ENV JAVA_HOME=/usr/lib/jvm/zulu15
ENV JAVA_INCLUDE_PATH=/usr/lib/jvm/zulu15/include
ENV TRAVIS_CPU_ARCH=amd64
ENV TRAVIS_OS_NAME=linux
ENV TRAVIS_BUILD_DIR=/work/tdlight-java
ENV TRAVIS_OUTPUT_DIR=/output
#RUN ./build.sh #RUN ./build.sh

8
jenkins/scripts/setup_variables.sh
View File

@ -1,12 +1,6 @@
#!/bin/bash -e #!/bin/bash -e
set -e set -e
# ====== Static variables
export TRAVIS_CPU_ARCH="amd64"
export TRAVIS_OS_NAME="linux"
export TRAVIS_BUILD_DIR="/work/tdlight-java"
export OUTPUT_DIR="/output"
# ====== Variables # ====== Variables
export TD_SRC_DIR=$TRAVIS_BUILD_DIR/dependencies/tdlight export TD_SRC_DIR=$TRAVIS_BUILD_DIR/dependencies/tdlight
export TD_BIN_DIR=$TRAVIS_BUILD_DIR/bin-td export TD_BIN_DIR=$TRAVIS_BUILD_DIR/bin-td
@ -63,7 +57,7 @@ elif [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
#export JAVA_HOME="/usr/lib/jvm/java-11-openjdk-$TRAVIS_CPU_ARCH_JAVA" #export JAVA_HOME="/usr/lib/jvm/java-11-openjdk-$TRAVIS_CPU_ARCH_JAVA"
#export JAVA_INCLUDE_PATH="/usr/lib/jvm/java-11-openjdk-$TRAVIS_CPU_ARCH_JAVA/include" #export JAVA_INCLUDE_PATH="/usr/lib/jvm/java-11-openjdk-$TRAVIS_CPU_ARCH_JAVA/include"
fi fi
export TDLIB_RESOURCES_OUTPUT_DIR="$OUTPUT_DIR/resources/libs/$TRAVIS_OS_NAME_SHORT/$TRAVIS_CPU_ARCH_STANDARD" export TDLIB_RESOURCES_OUTPUT_DIR="$TRAVIS_OUTPUT_DIR/resources/libs/$TRAVIS_OS_NAME_SHORT/$TRAVIS_CPU_ARCH_STANDARD"
# ====== Print variables # ====== Print variables
echo "TD_SRC_DIR=${TD_SRC_DIR}" echo "TD_SRC_DIR=${TD_SRC_DIR}"