80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

Fix Jenkins CMake flags on MSYSTEM switching

Browse Source
This commit is contained in:
RichardG867
2021-11-14 21:20:47 -03:00
parent a95ce46240
commit 0e52a261cc
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.ci/build.sh
View File

@@ -145,7 +145,7 @@ build() {
echo [-] Switching to MSYSTEM [$msys] echo [-] Switching to MSYSTEM [$msys]
cd "$cwd" cd "$cwd"
CHERE_INVOKING=yes MSYSTEM="$msys" JOB_BASE_NAME="$JOB_BASE_NAME" BUILD_TYPE="$BUILD_TYPE" BUILD_NUMBER="$BUILD_NUMBER" GIT_COMMIT="$GIT_COMMIT" \ CHERE_INVOKING=yes MSYSTEM="$msys" JOB_BASE_NAME="$JOB_BASE_NAME" BUILD_TYPE="$BUILD_TYPE" BUILD_NUMBER="$BUILD_NUMBER" GIT_COMMIT="$GIT_COMMIT" \
bash -lc 'exec "'$0'" -b "'$arch'" '$cmake_flags && job_status=0 # make sure the main script exits cleanly on any success bash -lc 'exec "'$0'" -b "'$arch'" '"$cmake_flags" && job_status=0 # make sure the main script exits cleanly on any success
return $? return $?
fi fi
else else
@@ -354,7 +354,7 @@ EOF
: :
else else
# Create binary tarball. # Create binary tarball.
make_tar ../$job_name-Linux-$arch$build_fn.tar VERBOSE=1 make_tar ../$job_name-Linux-$arch$build_fn.tar
local status=$? local status=$?
fi fi
cd .. cd ..