TeaSpeak/Server-Root
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fixed script

Browse Source
This commit is contained in:
WolverinDEV 2020-01-26 17:37:05 +01:00
parent 93aa8d3bec
commit 806a371cb9
2 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Jenkinsfile vendored
View File

@ -16,9 +16,6 @@ pipeline {
//Make specific flags //Make specific flags
MAKE_OPTIONS = '-j32' MAKE_OPTIONS = '-j32'
JENKINS_BUILD_TARGET="${params.target}"
BUILD_TYPE="${params.build_type}"
} }
stages { stages {
@ -52,7 +49,7 @@ pipeline {
stage ('build::amd64::build') { stage ('build::amd64::build') {
steps { steps {
sh './build_teaspeak.sh' sh "./build_teaspeak.sh ${params.build_type}"
} }
} }
@ -62,7 +59,7 @@ pipeline {
} }
steps { steps {
sh 'cd TeaSpeak/server/repro/; chmod 400 build_private_key; ./build.sh linux/amd64_${BUILD_TYPE}' sh "cd TeaSpeak/server/repro/; chmod 400 build_private_key; ./build.sh linux/amd64_${params.build_type}"
} }
} }
} }
@ -98,7 +95,7 @@ pipeline {
stage ('build::x86::build') { stage ('build::x86::build') {
steps { steps {
sh './build_teaspeak.sh' sh "./build_teaspeak.sh ${params.build_type}"
} }
} }
@ -108,7 +105,7 @@ pipeline {
} }
steps { steps {
sh 'cd TeaSpeak/server/repro/; chmod 400 build_private_key; ./build.sh linux/x86_${BUILD_TYPE}' sh "cd TeaSpeak/server/repro/; chmod 400 build_private_key; ./build.sh linux/x86_${BUILD_TYPE}"
} }
} }
} }
@ -144,7 +141,7 @@ pipeline {
stage ('build::arm32v7::build') { stage ('build::arm32v7::build') {
steps { steps {
sh './build_teaspeak.sh' sh "./build_teaspeak.sh ${params.build_type}"
} }
} }
@ -154,7 +151,7 @@ pipeline {
} }
steps { steps {
sh 'cd TeaSpeak/server/repro/; chmod 400 build_private_key; ./build.sh linux/arm32v7_${BUILD_TYPE}' sh "cd TeaSpeak/server/repro/; chmod 400 build_private_key; ./build.sh linux/arm32v7_${BUILD_TYPE}"
} }
} }
} }

10
build_teaspeak.sh
View File

@ -2,27 +2,27 @@
_build_helper_dir="$(pwd)/build-helpers" _build_helper_dir="$(pwd)/build-helpers"
_build_type="Debug" _build_type="Debug"
if [[ -n "${BUILD_TYPE}" ]]; then if [[ -n "$1" ]]; then
echo "This is an automated jenkins build. Initializing variables." echo "This is an automated jenkins build. Initializing variables."
if [[ "${BUILD_TYPE}" == "debug" ]]; then if [[ "$1" == "debug" ]]; then
echo "Initializing debug session." echo "Initializing debug session."
export _build_type="Debug" export _build_type="Debug"
# shellcheck disable=SC2089 # shellcheck disable=SC2089
export TEASPEAK_DEPLOY_TYPE_SPECIFIER="-DBUILD_TYPE=1 -DBUILD_TYPE_NAME=\"beta\"" export TEASPEAK_DEPLOY_TYPE_SPECIFIER="-DBUILD_TYPE=1 -DBUILD_TYPE_NAME=\"beta\""
elif [[ "${BUILD_TYPE}" == "optimized" ]]; then elif [[ "$1" == "optimized" ]]; then
echo "Initializing optimized session." echo "Initializing optimized session."
export _build_type="RelWithDebInfo" export _build_type="RelWithDebInfo"
# shellcheck disable=SC2089 # shellcheck disable=SC2089
export TEASPEAK_DEPLOY_TYPE_SPECIFIER="-DBUILD_TYPE=1 -DBUILD_TYPE_NAME=\"beta\"" export TEASPEAK_DEPLOY_TYPE_SPECIFIER="-DBUILD_TYPE=1 -DBUILD_TYPE_NAME=\"beta\""
elif [[ "${BUILD_TYPE}" == "stable" ]]; then elif [[ "$1" == "stable" ]]; then
echo "Initializing stable session." echo "Initializing stable session."
export _build_type="RelWithDebInfo" export _build_type="RelWithDebInfo"
# shellcheck disable=SC2089 # shellcheck disable=SC2089
export TEASPEAK_DEPLOY_TYPE_SPECIFIER="-DBUILD_TYPE=0 -DBUILD_TYPE_NAME=\"\"" export TEASPEAK_DEPLOY_TYPE_SPECIFIER="-DBUILD_TYPE=0 -DBUILD_TYPE_NAME=\"\""
else else
echo "Unknown target build type: ${BUILD_TYPE}" echo "Unknown target build type: $1"
exit 1 exit 1
fi fi
fi fi