From 789cf13aae5cccaa8e4b37b75ae37d0f698036bf Mon Sep 17 00:00:00 2001
From: sholdee <102821812+sholdee@users.noreply.github.com>
Date: Fri, 12 Aug 2022 11:59:20 -0500
Subject: [PATCH] [ci] move asset gen timeout to steps block (#1163)

---
 Jenkinsfile | 32 +++++++++++++++-----------------
 1 file changed, 15 insertions(+), 17 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index bda64b9dd..c61fb682c 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -9,27 +9,25 @@ pipeline {
     
     stages {
         stage('Generate Assets') {
-            options {
-                timeout(time: 10)
-            }
             agent {
                 label "SoH-Asset-Builders"
             }
             steps {
-                checkout([
-                    $class: 'GitSCM',
-                    branches: scm.branches,
-                    doGenerateSubmoduleConfigurations: scm.doGenerateSubmoduleConfigurations,
-                    extensions: scm.extensions,
-                    userRemoteConfigs: scm.userRemoteConfigs
-                ])
-                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'
+                timeout(time: 10) {
+                    checkout([
+                        $class: 'GitSCM',
+                        branches: scm.branches,
+                        doGenerateSubmoduleConfigurations: scm.doGenerateSubmoduleConfigurations,
+                        extensions: scm.extensions,
+                        userRemoteConfigs: scm.userRemoteConfigs
+                    ])
+                    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'
+                }
             }
             post {
                 unsuccessful {