From 84ae673d70688b3092d4f1a30a4fd0453c080474 Mon Sep 17 00:00:00 2001 From: RichardG867 Date: Fri, 11 Feb 2022 14:23:34 -0300 Subject: [PATCH] Some Jenkins clarifications --- .ci/Jenkinsfile | 2 +- .ci/build.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.ci/Jenkinsfile b/.ci/Jenkinsfile index 0fd252253..f42350f04 100644 --- a/.ci/Jenkinsfile +++ b/.ci/Jenkinsfile @@ -149,7 +149,7 @@ pipeline { parameters { string(name: 'BUILD_TYPE', defaultValue: 'beta', /* !!! CHANGE HERE !!! for build type */ - description: "Build type to pass on to CMake. Don't change this, you should instead change the default value on .ci/Jenkinsfile") + description: "Build type to pass on to CMake. Should only be changed for one-off builds, otherwise change the default on .ci/Jenkinsfile") } stages { diff --git a/.ci/build.sh b/.ci/build.sh index 76c714018..45c599f69 100644 --- a/.ci/build.sh +++ b/.ci/build.sh @@ -211,7 +211,7 @@ then echo [-] Using MSYSTEM [$MSYSTEM] # Point CMake to the toolchain file. - cmake_flags_extra="$cmake_flags_extra -D CMAKE_TOOLCHAIN_FILE=\"cmake/$toolchain.cmake\"" + cmake_flags_extra="$cmake_flags_extra -D \"CMAKE_TOOLCHAIN_FILE=cmake/$toolchain.cmake\"" elif is_mac then # macOS lacks nproc, but sysctl can do the same job.