claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Some Jenkins clarifications

Browse Source
This commit is contained in:
RichardG867
2022-02-11 14:23:34 -03:00
parent 1eb32a6877
commit 84ae673d70
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.ci/Jenkinsfile vendored
View File

@@ -149,7 +149,7 @@ pipeline {
parameters { parameters {
string(name: 'BUILD_TYPE', string(name: 'BUILD_TYPE',
defaultValue: 'beta', /* !!! CHANGE HERE !!! for 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 { stages {

2
.ci/build.sh
View File

@@ -211,7 +211,7 @@ then
echo [-] Using MSYSTEM [$MSYSTEM] echo [-] Using MSYSTEM [$MSYSTEM]
# Point CMake to the toolchain file. # 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 elif is_mac
then then
# macOS lacks nproc, but sysctl can do the same job. # macOS lacks nproc, but sysctl can do the same job.