[ci] Share Generated Assets Across All Platforms (#1074)

HarbourMasters · Aug 8, 2022 · 9b33827 · 9b33827
1 parent 9afbe42
commit 9b33827
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 29 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -8,12 +8,35 @@ pipeline {
     }
 
     stages {
+        stage('Generate Assets') {
+            options {
+                timeout(time: 10)
+            }
+            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
+
+                        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'
+                }
+            }
+        }
         stage('Build SoH') {
             parallel {
                 stage ('Build Windows') {
-                    options {
-                        timeout(time: 20)
-                    }
                     environment {
                         PLATFORM='x64'
                         PYTHON='C:\\Users\\jenkins\\AppData\\Local\\Programs\\Python\\Python310\\python.exe'
@@ -34,12 +57,9 @@ pipeline {
                         ])
 
                         catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') {
-                            bat """ 
-
-                            xcopy "..\\..\\ZELOOTD.z64" "OTRExporter\\"
-                            
-                            "${env.CMAKE}" -S . -B "build\\${env.PLATFORM}" -G "Visual Studio 17 2022" -T ${env.TOOLSET} -A ${env.PLATFORM} -D Python3_EXECUTABLE=${env.PYTHON} -D CMAKE_BUILD_TYPE:STRING=Release
-                            "${env.CMAKE}" --build ".\\build\\${env.PLATFORM}" --target ExtractAssets --config Release
+                            unstash 'assets'
+                            bat """                             
+                            "${env.CMAKE}" -S . -B "build\\${env.PLATFORM}" -G "Visual Studio 17 2022" -T ${env.TOOLSET} -A ${env.PLATFORM} -D Python_EXECUTABLE=${env.PYTHON} -D CMAKE_BUILD_TYPE:STRING=Release
                             "${env.CMAKE}" --build ".\\build\\${env.PLATFORM}" --config Release
                             cd  ".\\build\\${env.PLATFORM}"
                             "${env.CPACK}" -G ZIP
@@ -57,9 +77,6 @@ pipeline {
                     }
                 }
                 stage ('Build Linux') {
-                    options {
-                        timeout(time: 20)
-                    }
                     agent {
                         label "SoH-Linux-Builders"
                     }
@@ -72,9 +89,8 @@ pipeline {
                             userRemoteConfigs: scm.userRemoteConfigs
                         ])
                         catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') {
+                            unstash 'assets'
                             sh '''
-                            
-                            cp ../../ZELOOTD.z64 OTRExporter/baserom_non_mq.z64
                             docker build . -t soh
                             docker run --name sohcont -dit --rm -v $(pwd):/soh soh /bin/bash
                             docker exec sohcont scripts/linux/appimage/build.sh
@@ -108,11 +124,9 @@ pipeline {
                             userRemoteConfigs: scm.userRemoteConfigs
                         ])
                         catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') {
+                            unstash 'assets'
                             sh '''
-                            cp ../../ZELOOTD.z64 OTRExporter/baserom_non_mq.z64
-
                             cmake --no-warn-unused-cli -H. -Bbuild-cmake -GNinja -DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_OSX_ARCHITECTURES="x86_64;arm64"
-                            cmake --build build-cmake --target ExtractAssets --
                             cmake --build build-cmake --config Release --
                             (cd build-cmake && cpack)
 
@@ -131,9 +145,6 @@ pipeline {
                     }
                 }
                 stage ('Build Switch') {
-                    options {
-                        timeout(time: 20)
-                    }
                     agent {
                         label "SoH-Linux-Builders"
                     }
@@ -146,9 +157,8 @@ pipeline {
                             userRemoteConfigs: scm.userRemoteConfigs
                         ])
                         catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') {
-                            sh '''
-                            
-                            cp ../../ZELOOTD.z64 OTRExporter/baserom_non_mq.z64
+                            unstash 'assets'
+                            sh '''                            
                             docker build . -t sohswitch
                             docker run --name sohcont -dit --rm -v $(pwd):/soh sohswitch /bin/bash
                             docker exec sohcont scripts/switch/build.sh

diff --git a/ZAPDTR/ZAPD/ZResource.cpp b/ZAPDTR/ZAPD/ZResource.cpp
@@ -348,11 +348,14 @@ std::string ZResource::GetSourceOutputHeader([[maybe_unused]] const std::string&
 			str += StringHelper::Sprintf("#define d%s \"__OTR__%s/%s\"", name.c_str(), outName.c_str(), nameStr.c_str());
 
 		if (nameSet && nameSet->find(name) == nameSet->end()) {
+			str += StringHelper::Sprintf(R"(
 #ifdef _WIN32
-			str += StringHelper::Sprintf("\nstatic const __declspec(align(2)) char %s[] = d%s;", name.c_str(), name.c_str());
+static const __declspec(align(2)) char %s[] = d%s;
 #else
-			str += StringHelper::Sprintf("\nstatic const char %s[] __attribute__((aligned (2))) = d%s;", name.c_str(), name.c_str());
+static const char %s[] __attribute__((aligned (2))) = d%s;
 #endif
+			)", name.c_str(), name.c_str(), name.c_str(), name.c_str());
+
 			if (nameSet) {
 				nameSet->insert(name);
 			}

diff --git a/scripts/linux/appimage/build.sh b/scripts/linux/appimage/build.sh
@@ -1,7 +1,6 @@
 #!/bin/bash
 
 cmake --no-warn-unused-cli -H. -Bbuild-cmake -GNinja -DCMAKE_BUILD_TYPE:STRING=Release
-cmake --build build-cmake --target ExtractAssets --
 cmake --build build-cmake --config Release --
 
 (cd build-cmake && cpack -G External)
diff --git a/scripts/switch/build.sh b/scripts/switch/build.sh
@@ -1,7 +1,4 @@
 #!/bin/bash
 
-cmake --no-warn-unused-cli -H. -Bbuild-linux -GNinja
-cmake --build build-linux --target ExtractAssets
-
 cmake -H. -Bbuild-switch -GNinja -DCMAKE_TOOLCHAIN_FILE=/opt/devkitpro/cmake/Switch.cmake
 cmake --build build-switch --target soh_nro