From 12715fdd5f8345195ce0a145a8358434e02194cd Mon Sep 17 00:00:00 2001
From: f-trycua <f@trycua.com>
Date: Mon, 17 Mar 2025 12:05:26 +0100
Subject: [PATCH] Split upload steps

---
 .github/workflows/publish-lume.yml | 31 +++++++++++++++++++++++-------
 1 file changed, 24 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/publish-lume.yml b/.github/workflows/publish-lume.yml
index a4bc5e86..a8c1d935 100644
--- a/.github/workflows/publish-lume.yml
+++ b/.github/workflows/publish-lume.yml
@@ -49,6 +49,7 @@ jobs:
     runs-on: macos-15
     outputs:
       sha256_checksums: ${{ steps.generate_checksums.outputs.checksums }}
+      version: ${{ steps.set_version.outputs.version }}
     steps:
       - uses: actions/checkout@v4
 
@@ -121,6 +122,7 @@ jobs:
           rm application.p12 installer.p12
 
       - name: Build and Notarize
+        id: build_notarize
         env:
           APPLE_ID: ${{ secrets.APPLE_ID }}
           TEAM_ID: ${{ secrets.TEAM_ID }}
@@ -155,7 +157,15 @@ jobs:
           
           # Debug: List what files were actually created
           echo "Files in .release directory:"
-          ls -la .release
+          find .release -type f -name "*.tar.gz" -o -name "*.pkg.tar.gz"
+          
+          # Get architecture for output filename
+          ARCH=$(uname -m)
+          OS_IDENTIFIER="darwin-${ARCH}"
+          
+          # Output paths for later use
+          echo "tarball_path=.release/lume-${VERSION}-${OS_IDENTIFIER}.tar.gz" >> $GITHUB_OUTPUT
+          echo "pkg_path=.release/lume-${VERSION}-${OS_IDENTIFIER}.pkg.tar.gz" >> $GITHUB_OUTPUT
 
       - name: Generate SHA256 Checksums
         id: generate_checksums
@@ -181,20 +191,27 @@ jobs:
           echo "All files in release directory:"
           ls -la
 
-      - name: Upload Notarized Package
+      - name: Upload Notarized Package (Tarball)
         uses: actions/upload-artifact@v4
         with:
-          name: lume-notarized
-          path: ./libs/lume/.release/lume-*.tar.gz
-          if-no-files-found: warn
+          name: lume-notarized-tarball
+          path: ./libs/lume/${{ steps.build_notarize.outputs.tarball_path }}
+          if-no-files-found: error
+
+      - name: Upload Notarized Package (Installer)
+        uses: actions/upload-artifact@v4
+        with:
+          name: lume-notarized-installer
+          path: ./libs/lume/${{ steps.build_notarize.outputs.pkg_path }}
+          if-no-files-found: error
 
       - name: Create Release
         if: startsWith(github.ref, 'refs/tags/')
         uses: softprops/action-gh-release@v1
         with:
           files: |
-            ./libs/lume/.release/lume-*.tar.gz
-            ./libs/lume/.release/lume-*.pkg.tar.gz
+            ./libs/lume/${{ steps.build_notarize.outputs.tarball_path }}
+            ./libs/lume/${{ steps.build_notarize.outputs.pkg_path }}
           body: |
             ${{ steps.generate_checksums.outputs.checksums }}