From 2090dfe8df3b78f8999461b35aa29800ee899e1c Mon Sep 17 00:00:00 2001
From: CptMoore <39010654+CptMoore@users.noreply.github.com>
Date: Tue, 20 Sep 2022 20:06:28 +0200
Subject: [PATCH 1/2] Simplified zip creation and added an all-in-one zip,
 closes #35.

---
 .github/workflows/build-be.yml | 24 +++++++-----------------
 1 file changed, 7 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/build-be.yml b/.github/workflows/build-be.yml
index 6425a73..4f54e2c 100644
--- a/.github/workflows/build-be.yml
+++ b/.github/workflows/build-be.yml
@@ -160,15 +160,13 @@ jobs:
           echo "doorstop_version=$VERSION" >> $GITHUB_ENV
       - name: Create zips
         run: |
+          mkdir dist
           cd artifacts
-          (cd doorstop_win_release; zip -r ../doorstop_win_release_${{ env.doorstop_version }}.zip *)
-          (cd doorstop_win_verbose; zip -r ../doorstop_win_verbose_${{ env.doorstop_version }}.zip *)
-          (cd doorstop_linux_release; zip -r ../doorstop_linux_release_${{ env.doorstop_version }}.zip *)
-          (cd doorstop_linux_verbose; zip -r ../doorstop_linux_verbose_${{ env.doorstop_version }}.zip *)
-          (cd doorstop_linux_debug; zip -r ../doorstop_linux_debug_${{ env.doorstop_version }}.zip *)
-          (cd doorstop_macos_release; zip -r ../doorstop_macos_release_${{ env.doorstop_version }}.zip *)
-          (cd doorstop_macos_verbose; zip -r ../doorstop_macos_verbose_${{ env.doorstop_version }}.zip *)
-          (cd doorstop_macos_debug; zip -r ../doorstop_macos_debug_${{ env.doorstop_version }}.zip *)
+          zip -r ../dist/doorstop_all_in_one_${{ env.doorstop_version }}.zip *
+          for dir in *
+          do
+            (cd ${dir}; zip -r ../../dist/${dir}_${{ env.doorstop_version }}.zip *)
+          done
       - name: Create release
         uses: marvinpinto/action-automatic-releases@latest
         with:
@@ -176,12 +174,4 @@ jobs:
           automatic_release_tag: "ci"
           prerelease: true
           title: "CI build"
-          files: |
-            artifacts/doorstop_win_release_${{ env.doorstop_version }}.zip
-            artifacts/doorstop_win_verbose_${{ env.doorstop_version }}.zip
-            artifacts/doorstop_linux_release_${{ env.doorstop_version }}.zip
-            artifacts/doorstop_linux_verbose_${{ env.doorstop_version }}.zip
-            artifacts/doorstop_linux_debug_${{ env.doorstop_version }}.zip
-            artifacts/doorstop_macos_release_${{ env.doorstop_version }}.zip
-            artifacts/doorstop_macos_verbose_${{ env.doorstop_version }}.zip
-            artifacts/doorstop_macos_debug_${{ env.doorstop_version }}.zip
+          files: dist/*.zip

From 21a0c2f0a0e575b56e44cad337e59c16064b3993 Mon Sep 17 00:00:00 2001
From: CptMoore <39010654+CptMoore@users.noreply.github.com>
Date: Wed, 21 Sep 2022 21:29:05 +0200
Subject: [PATCH 2/2] Update .github/workflows/build-be.yml

Co-authored-by: Geoffrey Horsington <neigh@coder.horse>
---
 .github/workflows/build-be.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build-be.yml b/.github/workflows/build-be.yml
index 4f54e2c..5a0c952 100644
--- a/.github/workflows/build-be.yml
+++ b/.github/workflows/build-be.yml
@@ -162,7 +162,7 @@ jobs:
         run: |
           mkdir dist
           cd artifacts
-          zip -r ../dist/doorstop_all_in_one_${{ env.doorstop_version }}.zip *
+          zip -r ../dist/doorstop_all_${{ env.doorstop_version }}.zip *
           for dir in *
           do
             (cd ${dir}; zip -r ../../dist/${dir}_${{ env.doorstop_version }}.zip *)