diff --git a/Jenkinsfile b/Jenkinsfile index a2c4203cc..6fcca055a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -120,41 +120,38 @@ pipeline { } } } - } - } - stage ('Build macOS') { - agent { - label "SoH-Mac-Builders" - } - steps { - checkout([ - $class: 'GitSCM', - branches: scm.branches, - doGenerateSubmoduleConfigurations: scm.doGenerateSubmoduleConfigurations, - extensions: scm.extensions, - userRemoteConfigs: scm.userRemoteConfigs - ]) - catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') { - sh ''' - cp ../../ZELOOTD.z64 OTRExporter/baserom_non_mq.z64 - - cd soh - make setup -j4 DEBUG=0 CC=gcc-12 CXX=g++-12 - make -j4 DEBUG=0 CC=gcc-12 CXX=g++-12 - - make -j4 appbundle - - mv ../README.md readme.txt - 7z a soh-mac.7z soh.app readme.txt - ''' - } - archiveArtifacts artifacts: 'soh/soh-mac.7z', followSymlinks: false, onlyIfSuccessful: true - } - post { - always { - step([$class: 'WsCleanup']) // Clean workspace + stage ('Build macOS') { + agent { + label "SoH-Mac-Builders" + } + steps { + checkout([ + $class: 'GitSCM', + branches: scm.branches, + doGenerateSubmoduleConfigurations: scm.doGenerateSubmoduleConfigurations, + extensions: scm.extensions, + userRemoteConfigs: scm.userRemoteConfigs + ]) + catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') { + sh ''' + cp ../../ZELOOTD.z64 OTRExporter/baserom_non_mq.z64 + cd soh + make setup -j4 DEBUG=0 CC=gcc-12 CXX=g++-12 + make -j4 DEBUG=0 CC=gcc-12 CXX=g++-12 + make -j4 appbundle + mv ../README.md readme.txt + 7z a soh-mac.7z soh.app readme.txt + ''' + } + archiveArtifacts artifacts: 'soh/soh-mac.7z', followSymlinks: false, onlyIfSuccessful: true + } + post { + always { + step([$class: 'WsCleanup']) // Clean workspace + } + } } } } } -} \ No newline at end of file +}