From 0f30b5f650f0b44274139ec99e8da1cc23fd896c Mon Sep 17 00:00:00 2001
From: David Sangrey <rixxan@hullseals.space>
Date: Sun, 16 Nov 2025 22:51:55 -0500
Subject: [PATCH] [1790] Update Build Script

---
 .github/workflows/windows-build.yml | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/windows-build.yml b/.github/workflows/windows-build.yml
index 41b7be88..1b3e7773 100644
--- a/.github/workflows/windows-build.yml
+++ b/.github/workflows/windows-build.yml
@@ -34,12 +34,15 @@ jobs:
         run: |
           echo "${{ needs.variables.outputs.short_sha }}" > .gitversion
 
+      - name: Sanitize version for filenames
+        run: echo "SAFE_SEMVER=${{ needs.variables.outputs.sem_ver }}" | tr '/ ' '_' >> $GITHUB_ENV
+
       - name: Make tar archive
         run: |
           # For 'tar' we can only specify filename/glob exclusions, not any
           # directory location
           tar -c -v -z \
-              -f "../EDMarketConnector-release-${{ needs.variables.outputs.sem_ver }}.tar.gz" \
+              -f "../EDMarketConnector-release-${SAFE_SEMVER}.tar.gz" \
               -C .. \
               --exclude=EDMarketConnector-release-*.* \
               --exclude=.editorconfig \
@@ -59,7 +62,7 @@ jobs:
               --exclude=scripts \
               --exclude=tests \
               EDMarketConnector
-            mv "../EDMarketConnector-release-${{ needs.variables.outputs.sem_ver }}.tar.gz" .
+            mv "../EDMarketConnector-release-${SAFE_SEMVER}.tar.gz" .
 
       - name: Upload build files
         uses: actions/upload-artifact@v5
@@ -68,9 +71,9 @@ jobs:
           path: |
               EDMarketConnector-release-*.tar.gz
 
-  windows_build_32:
+  windows_build_86:
     needs: [variables]
-    name: Build EDMC
+    name: Build EDMC (x86)
     runs-on: windows-latest
 
     defaults:
@@ -82,6 +85,9 @@ jobs:
         with:
           submodules: true
 
+      - name: Sanitize version for filenames
+        run: echo "SAFE_SEMVER=${{ needs.variables.outputs.sem_ver }}" | tr '/ ' '_' >> $GITHUB_ENV
+
       - name: Make zip archive
         uses: thedoctor0/zip-release@main
         with:
@@ -94,7 +100,7 @@ jobs:
           path: 'EDMarketConnector'
           # 3. The .zip file has to be in the 'root' so that upload-artifact
           #   will process it.  Can't use relative paths.
-          filename: 'EDMarketConnector/EDMarketConnector-release-${{ needs.variables.outputs.sem_ver }}.zip'
+          filename: 'EDMarketConnector/EDMarketConnector-release-${SAFE_SEMVER}.zip'
           # 4. And all the exclusions need to be prefixed with the 'root'
           #   directory.
           # NB: If this gets too long it can cause zip 'Command Line Error',
@@ -136,13 +142,13 @@ jobs:
       - name: Upload build files
         uses: actions/upload-artifact@v5
         with:
-          name: built-files-windows
+          name: built-files-windows-x86
           path: |
               EDMarketConnector_Installer_*.exe
               EDMarketConnector-release-*.zip
   windows_build_64:
     needs: [variables]
-    name: Build EDMC
+    name: Build EDMC (x64)
     runs-on: windows-latest
 
     defaults:
@@ -166,7 +172,7 @@ jobs:
           path: 'EDMarketConnector'
           # 3. The .zip file has to be in the 'root' so that upload-artifact
           #   will process it.  Can't use relative paths.
-          filename: 'EDMarketConnector/EDMarketConnector-release-${{ needs.variables.outputs.sem_ver }}.zip'
+          filename: 'EDMarketConnector/EDMarketConnector-release-${SAFE_SEMVER}.zip'
           # 4. And all the exclusions need to be prefixed with the 'root'
           #   directory.
           # NB: If this gets too long it can cause zip 'Command Line Error',
@@ -209,7 +215,7 @@ jobs:
       - name: Upload build files
         uses: actions/upload-artifact@v5
         with:
-          name: built-files-windows
+          name: built-files-windows-64
           path: |
               EDMarketConnector_Installer_*.exe
               EDMarketConnector-release-*.zip