From d4470f92ed128fca6bd4fb99e10f20e02b31a12a Mon Sep 17 00:00:00 2001 From: WolverinDEV Date: Fri, 19 Apr 2019 14:20:13 +0200 Subject: [PATCH] Updated Jenkinsfile --- Jenkinsfile | 10 ++++++++++ build_teaspeak.sh | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 6383937..6481d8b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -72,6 +72,8 @@ pipeline { environment { TEASPEAK_BUILD_TYPE="Debug" CMAKE_BUILD_TYPE="Debug" + + TEASPEAK_DEPLOY_TYPE_SPECIFIER="-DBUILD_TYPE=1 -DBUILD_TYPE_NAME='beta'" } steps { @@ -101,6 +103,8 @@ pipeline { environment { TEASPEAK_BUILD_TYPE="Release" CMAKE_BUILD_TYPE="RelWithDebInfo" + + TEASPEAK_DEPLOY_TYPE_SPECIFIER="-DBUILD_TYPE=1 -DBUILD_TYPE_NAME='beta'" } steps { @@ -130,6 +134,8 @@ pipeline { environment { TEASPEAK_BUILD_TYPE="Release" CMAKE_BUILD_TYPE="RelWithDebInfo" + + TEASPEAK_DEPLOY_TYPE_SPECIFIER="-DBUILD_TYPE=0 -DBUILD_TYPE_NAME" } steps { @@ -186,6 +192,8 @@ pipeline { environment { TEASPEAK_BUILD_TYPE="Debug" CMAKE_BUILD_TYPE="Debug" + + TEASPEAK_DEPLOY_TYPE_SPECIFIER="-DBUILD_TYPE=1 -DBUILD_TYPE_NAME='beta'" } steps { @@ -215,6 +223,8 @@ pipeline { environment { TEASPEAK_BUILD_TYPE="Release" CMAKE_BUILD_TYPE="RelWithDebInfo" + + TEASPEAK_DEPLOY_TYPE_SPECIFIER="-DBUILD_TYPE=1 -DBUILD_TYPE_NAME='beta'" } steps { diff --git a/build_teaspeak.sh b/build_teaspeak.sh index b9def0c..298546b 100755 --- a/build_teaspeak.sh +++ b/build_teaspeak.sh @@ -5,7 +5,7 @@ fi mkdir build && cd build echo "Build type: ${TEASPEAK_BUILD_TYPE}" -cmake .. -DCMAKE_BUILD_TYPE="${TEASPEAK_BUILD_TYPE}" -DCMAKE_CXX_FLAGS=" ${CXX_FLAGS} -I/usr/local/mysql/connector-c++-8.0/include/jdbc/ -I../../../libraries/boringssl/include/ -D_GLIBCXX_USE_CXX11_ABI=1" -DDISABLE_CUSTOM_OUTPUT=ON -DDISABLE_QT=ON +cmake .. -DCMAKE_BUILD_TYPE="${TEASPEAK_BUILD_TYPE}" -DCMAKE_CXX_FLAGS=" ${CXX_FLAGS} -I/usr/local/mysql/connector-c++-8.0/include/jdbc/ -I../../../libraries/boringssl/include/ -D_GLIBCXX_USE_CXX11_ABI=1" -DDISABLE_CUSTOM_OUTPUT=ON -DDISABLE_QT=ON $TEASPEAK_DEPLOY_TYPE_SPECIFIER if [ $? -ne 0 ]; then echo "Failed to run CMAKE project" exit 1