From 89a7c86840b977803205e0cdc0bb40e61cf43eeb Mon Sep 17 00:00:00 2001
From: Ross Scroggs <ross.scroggs@gmail.com>
Date: Mon, 12 Feb 2024 18:08:19 -0800
Subject: [PATCH] Try multi artifact build - 2

---
 .github/workflows/build.yml | 34 ++++++++++++++++------------------
 1 file changed, 16 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 1bb81273..3e31eb7e 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -857,20 +857,20 @@ jobs:
             src/*.zip
             src/*.msi
 
-#  merge:
-#    if: (github.event_name == 'push' || github.event_name == 'schedule')
-#    runs-on: ubuntu-latest
-#    needs: build
-#    permissions:
-#      contents: write
-#      packages: write
-#    steps:
-#      - name: Merge Artifacts
-#        uses: actions/upload-artifact/merge@v4
-#        with:
-#          name: gam-binaries
-#          pattern: gam-binaries-*
-#
+  merge:
+    if: (github.event_name == 'push' || github.event_name == 'schedule')
+    runs-on: ubuntu-latest
+    needs: build
+    permissions:
+      contents: write
+      packages: write
+    steps:
+      - name: Merge Artifacts
+        uses: actions/upload-artifact/merge@v4
+        with:
+          name: gam-binaries
+          pattern: gam-binaries-*
+
 #      - name: Delete Artifacts
 #        uses: geekyeggo/delete-artifact@v4
 #        with:
@@ -879,8 +879,7 @@ jobs:
   publish:
     if: github.event_name == 'push'
     runs-on: ubuntu-latest
-    needs: build
-#    needs: merge
+    needs: merge
     permissions:
       contents: write
       packages: write
@@ -918,5 +917,4 @@ jobs:
           prerelease: false
           draft: true
           files: |
-#            gam-binaries/*
-            gam-binaries-*/*
+            gam-binaries/*