From 61bf2f69aa2da3d03e95a9ac8cc369db82ff5eb1 Mon Sep 17 00:00:00 2001
From: Matt Nadareski <mnadareski@outlook.com>
Date: Tue, 5 Nov 2024 13:40:05 -0500
Subject: [PATCH] Attempt to reduce nesting in GHA builds

---
 .github/workflows/build_check.yml | 4 +++-
 .github/workflows/build_cli.yml   | 4 +++-
 .github/workflows/build_ui.yml    | 4 +++-
 CHANGELIST.md                     | 1 +
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build_check.yml b/.github/workflows/build_check.yml
index bc11a809..bdc0afe0 100644
--- a/.github/workflows/build_check.yml
+++ b/.github/workflows/build_check.yml
@@ -29,7 +29,9 @@ jobs:
       run: dotnet publish ${{ matrix.project }}/${{ matrix.project }}.csproj -f ${{ matrix.framework }} -r ${{ matrix.runtime }} -c Debug --self-contained true --version-suffix ${{ github.sha }} ${{ (startsWith(matrix.framework, 'net5') || startsWith(matrix.framework, 'net6') || startsWith(matrix.framework, 'net7') || startsWith(matrix.framework, 'net8')) && '-p:PublishSingleFile=true' || ''}}
         
     - name: Archive build
-      run: zip -r ${{ matrix.project }}_${{ matrix.framework }}_${{ matrix.runtime }}_debug.zip ${{ matrix.project }}/bin/Debug/${{ matrix.framework }}/${{ matrix.runtime }}/publish/
+      run: |
+        cd ${{ matrix.project }}/bin/Debug/${{ matrix.framework }}/${{ matrix.runtime }}/publish/
+        zip -r ${{ matrix.project }}_${{ matrix.framework }}_${{ matrix.runtime }}_debug.zip ./
         
     - name: Upload build
       uses: actions/upload-artifact@v4
diff --git a/.github/workflows/build_cli.yml b/.github/workflows/build_cli.yml
index 7dc74639..db31c9c7 100644
--- a/.github/workflows/build_cli.yml
+++ b/.github/workflows/build_cli.yml
@@ -29,7 +29,9 @@ jobs:
       run: dotnet publish ${{ matrix.project }}/${{ matrix.project }}.csproj -f ${{ matrix.framework }} -r ${{ matrix.runtime }} -c Debug --self-contained true --version-suffix ${{ github.sha }} ${{ (startsWith(matrix.framework, 'net5') || startsWith(matrix.framework, 'net6') || startsWith(matrix.framework, 'net7') || startsWith(matrix.framework, 'net8')) && '-p:PublishSingleFile=true' || ''}}
         
     - name: Archive build
-      run: zip -r ${{ matrix.project }}_${{ matrix.framework }}_${{ matrix.runtime }}_debug.zip ${{ matrix.project }}/bin/Debug/${{ matrix.framework }}/${{ matrix.runtime }}/publish/
+      run: |
+        cd ${{ matrix.project }}/bin/Debug/${{ matrix.framework }}/${{ matrix.runtime }}/publish/
+        zip -r ${{ matrix.project }}_${{ matrix.framework }}_${{ matrix.runtime }}_debug.zip ./
         
     - name: Upload build
       uses: actions/upload-artifact@v4
diff --git a/.github/workflows/build_ui.yml b/.github/workflows/build_ui.yml
index dccfcb5f..4aca4807 100644
--- a/.github/workflows/build_ui.yml
+++ b/.github/workflows/build_ui.yml
@@ -43,7 +43,9 @@ jobs:
         mv redumper-2024.10.12_build416-win64/bin/redumper.exe MPF.UI/bin/Debug/${{ matrix.framework }}/${{ matrix.runtime }}/publish/Programs/Redumper/
 
     - name: Archive build
-      run: zip -r ${{ matrix.project }}_${{ matrix.framework }}_${{ matrix.runtime }}_debug.zip ${{ matrix.project }}/bin/Debug/${{ matrix.framework }}/${{ matrix.runtime }}/publish/
+      run: |
+        cd ${{ matrix.project }}/bin/Debug/${{ matrix.framework }}/${{ matrix.runtime }}/publish/
+        zip -r ${{ matrix.project }}_${{ matrix.framework }}_${{ matrix.runtime }}_debug.zip ./
         
     - name: Upload build
       uses: actions/upload-artifact@v4
diff --git a/CHANGELIST.md b/CHANGELIST.md
index b67fc81f..10e7b01d 100644
--- a/CHANGELIST.md
+++ b/CHANGELIST.md
@@ -36,6 +36,7 @@
 - Remove tupling from everything except CLI programs
 - Remove last instances of ValueTuple usage
 - Update BinaryObjectScanner to 3.1.16
+- Attempt to reduce nesting in GHA builds
 
 ### 3.2.2 (2024-09-24)