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

Attempt to fix Jenkins build script exit code issue

Browse Source
This commit is contained in:
RichardG867
2021-11-08 23:17:17 -03:00
parent 703aa87cbf
commit 1b4745847b
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.jenkins/Jenkinsfile vendored
View File

@@ -23,7 +23,7 @@ def gitClone() {
} }
def windowsBuild() { def windowsBuild() {
bat 'C:\\msys64\\msys2_shell.cmd -msys2 -defterm -here -no-start -c .jenkins/build.sh' bat 'C:\\msys64\\msys2_shell.cmd -msys2 -defterm -here -no-start -c "exec .jenkins/build.sh"'
} }
def unixBuild() { def unixBuild() {

14
.jenkins/build.sh
View File

@@ -208,12 +208,13 @@ EOF
arm32) local cmake_flags_extra="$cmake_flags_extra -D NEW_DYNAREC=ON -D ARCH=arm";; arm32) local cmake_flags_extra="$cmake_flags_extra -D NEW_DYNAREC=ON -D ARCH=arm";;
arm64) local cmake_flags_extra="$cmake_flags_extra -D NEW_DYNAREC=ON -D ARCH=arm64";; arm64) local cmake_flags_extra="$cmake_flags_extra -D NEW_DYNAREC=ON -D ARCH=arm64";;
# no dynarec # no dynarec
*) local cmake_flags_extra="$cmake_flags_extra -D DYNAREC=OFF";; # no dynarec *) local cmake_flags_extra="$cmake_flags_extra -D DYNAREC=OFF";;
esac esac
# Run CMake. # Run CMake.
echo [-] Running CMake cmake_flags_extra="$cmake_flags_extra -D BUILD_TYPE=\"$BUILD_TYPE\" -D EMU_BUILD=\"$build_qualifier\" -D EMU_GIT_HASH=\"$git_hash\""
cmake -G "Unix Makefiles" $cmake_flags $cmake_flags_extra -D BUILD_TYPE="$BUILD_TYPE" -D EMU_BUILD="$build_qualifier" -D EMU_GIT_HASH="$git_hash" . echo [-] Running CMake with flags [$cmake_flags $cmake_flags_extra]
cmake -G "Unix Makefiles" $cmake_flags $cmake_flags_extra .
local status=$? local status=$?
if [ $? -gt 0 ] if [ $? -gt 0 ]
then then
@@ -333,7 +334,7 @@ EOF
# All good. # All good.
echo [-] Build of [$job_name] [$build_number] [$git_hash] for [$arch] with flags [$cmake_flags] successful echo [-] Build of [$job_name] [$build_number] [$git_hash] for [$arch] with flags [$cmake_flags] successful
job_exit=0 export job_exit=0
} }
# Set common variables. # Set common variables.
@@ -444,8 +445,11 @@ case $JOB_BASE_NAME in
;; ;;
*) *)
echo Error: unknown job name $JOB_BASE_NAME echo [!] Unknown job name $JOB_BASE_NAME
exit 1 exit 1
;; ;;
esac esac
echo
echo [-] Exiting with code [$job_exit]
exit $job_exit exit $job_exit