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

Update Jenkinsfile, compile.sh, and 2 more files...

Browse Source
This commit is contained in:
Andrea Cavalli 2020-10-04 20:18:19 +02:00
parent b20fe2a9f4
commit 94f2b7dfca
4 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Jenkinsfile vendored
View File

@ -23,10 +23,6 @@ pipeline {
stage("Setup workspace") { stage("Setup workspace") {
agent none agent none
steps { steps {
sh "ls -alch /"
sh "ls -alch /var/"
sh "ls -alch /var/jenkins_home/"
sh "ls -alch /var/jenkins_cache/"
sh "mkdir -p \"/var/jenkins_cache/.m2\"" sh "mkdir -p \"/var/jenkins_cache/.m2\""
sh "chown 1000:1000 -R \"/var/jenkins_cache/.m2\"" sh "chown 1000:1000 -R \"/var/jenkins_cache/.m2\""
sh "mkdir -p \"/var/jenkins_cache/.ccache\"" sh "mkdir -p \"/var/jenkins_cache/.ccache\""
@ -34,7 +30,7 @@ pipeline {
sh "mkdir -p \"${workspace}/work\"" sh "mkdir -p \"${workspace}/work\""
sh "chown 1000:1000 -R \"${workspace}/work\"" sh "chown 1000:1000 -R \"${workspace}/work\""
sh "mkdir -p \"${workspace}/output\"" sh "mkdir -p \"${workspace}/output\""
sh "chown 1000:1000 -R \"${workspace}/output\"" sh "chown 1000:1000 -R \"${workspace}\""
} }
} }
@ -44,7 +40,7 @@ pipeline {
dir 'jenkins/docker' dir 'jenkins/docker'
filename 'dockerfile' filename 'dockerfile'
additionalBuildArgs '--build-arg version=1.0.0 --build-arg UID=1000 --build-arg GID=1000 --build-arg UNAME=jenkins' additionalBuildArgs '--build-arg version=1.0.0 --build-arg UID=1000 --build-arg GID=1000 --build-arg UNAME=jenkins'
args "-v \"${workspace}/tdlight-java/src/main:/home/jenkins/output\" -v \"/var/jenkins_cache/.m2:/home/jenkins/.m2\" -v \"/var/jenkins_cache/.ccache:/home/jenkins/.ccache:rw\" -v \"${workspace}:/home/jenkins/work\"" args "-v \"${workspace}/tdlight-java/src/main:/home/jenkins/output:rw\" -v \"/var/jenkins_cache/.m2:/home/jenkins/.m2:rw\" -v \"/var/jenkins_cache/.ccache:/home/jenkins/.ccache:rw\" -v \"${workspace}:/home/jenkins/work:rw\""
reuseNode false reuseNode false
} }
} }

3
jenkins/scripts/compile.sh
View File

@ -9,11 +9,8 @@ bash ./jenkins/scripts/setup_workspace.sh
# ====== Build Td # ====== Build Td
echo "JAVA_INCLUDE_PATH:$JAVA_INCLUDE_PATH" echo "JAVA_INCLUDE_PATH:$JAVA_INCLUDE_PATH"
ls -alch $JAVA_INCLUDE_PATH
echo "JAVA_INCLUDE_PATH2:$JAVA_INCLUDE_PATH2" echo "JAVA_INCLUDE_PATH2:$JAVA_INCLUDE_PATH2"
ls -alch $JAVA_INCLUDE_PATH2
echo "JAVA_AWT_INCLUDE_PATH:$JAVA_AWT_INCLUDE_PATH" echo "JAVA_AWT_INCLUDE_PATH:$JAVA_AWT_INCLUDE_PATH"
ls -alch $JAVA_AWT_INCLUDE_PATH
# Prepare build # Prepare build
cd $TD_BUILD_DIR cd $TD_BUILD_DIR
if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then

4
jenkins/scripts/setup_variables.sh
View File

@ -83,7 +83,7 @@ echo "TRAVIS_OS_NAME_SHORT=${TRAVIS_OS_NAME_SHORT}"
echo "SRC_TDJNI_LIBNAME=${SRC_TDJNI_LIBNAME}" echo "SRC_TDJNI_LIBNAME=${SRC_TDJNI_LIBNAME}"
echo "DEST_TDJNI_LIBNAME=${DEST_TDJNI_LIBNAME}" echo "DEST_TDJNI_LIBNAME=${DEST_TDJNI_LIBNAME}"
echo "TDLIB_RESOURCES_OUTPUT_DIR=${TDLIB_RESOURCES_OUTPUT_DIR}" echo "TDLIB_RESOURCES_OUTPUT_DIR=${TDLIB_RESOURCES_OUTPUT_DIR}"
echo "CURRENT DIRECTORY*=$(pwd)" echo "CURRENT DIRECTORY* ($(pwd)):"
ls -alch "$(pwd)" ls -alch "$(pwd)"
echo "WORK DIRECTORY CONTENT* (${TRAVIS_BUILD_DIR})=" echo "WORK DIRECTORY CONTENT* (${TRAVIS_BUILD_DIR}):"
ls -alch "$TRAVIS_BUILD_DIR" ls -alch "$TRAVIS_BUILD_DIR"

2
jenkins/scripts/setup_workspace.sh
View File

@ -22,8 +22,6 @@ if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
echo "Linux" echo "Linux"
echo "CCACHE statistics:" echo "CCACHE statistics:"
ccache -s ccache -s
echo "CCACHE dir content: $CCACHE_DIR"
ls -alch "$CCACHE_DIR"
elif [[ "$TRAVIS_OS_NAME" == "osx" ]]; then elif [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
echo "OSX" echo "OSX"
elif [[ "$TRAVIS_OS_NAME" == "windows" ]]; then elif [[ "$TRAVIS_OS_NAME" == "windows" ]]; then