From e88000aeb0836821b84c4ff66fc5b489d2b6c197 Mon Sep 17 00:00:00 2001
From: sholdee <102821812+sholdee@users.noreply.github.com>
Date: Thu, 11 Aug 2022 03:05:26 -0500
Subject: [PATCH] [ci] asset stage tweaks (#1120)

---
 Jenkinsfile | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 80df7b0cc..7f24cb317 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -13,7 +13,7 @@ pipeline {
                 timeout(time: 10)
             }
             agent {
-                label "SoH-Mac-Builders"
+                label "SoH-Asset-Builders"
             }
             steps {
                 checkout([
@@ -23,14 +23,17 @@ pipeline {
                     extensions: scm.extensions,
                     userRemoteConfigs: scm.userRemoteConfigs
                 ])
-                catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') {
-                    sh '''
-                        cp ../../ZELOOTD.z64 OTRExporter/baserom_non_mq.z64
+                sh '''
+                    cp ../../ZELOOTD.z64 OTRExporter/baserom_non_mq.z64
 
-                        cmake --no-warn-unused-cli -H. -Bbuild-cmake -GNinja -DCMAKE_BUILD_TYPE:STRING=Release
-                        cmake --build build-cmake --target ExtractAssets --config Release
-                    '''
-                    stash includes: 'soh/assets/**/*', name: 'assets'
+                    cmake --no-warn-unused-cli -H. -Bbuild-cmake -GNinja -DCMAKE_BUILD_TYPE:STRING=Release
+                    cmake --build build-cmake --target ExtractAssets --config Release
+                '''
+                stash includes: 'soh/assets/**/*', name: 'assets'
+            }
+            post {
+                unsuccessful {
+                    step([$class: 'WsCleanup']) // Clean workspace
                 }
             }
         }