From a8a2a17f409d54dc36d0d412d25850529a145c21 Mon Sep 17 00:00:00 2001
From: Ovler <ovlertheyoung@gmail.com>
Date: Tue, 3 Dec 2024 01:07:16 -0500
Subject: [PATCH 1/3] ci(macos): resolve artifact filename conflict for MacOS
 ZIP upload

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 97ffe94f4..3e38928a4 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -393,7 +393,7 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           path: "temp_macos/*.zip"
-          name: Rune-${{ github.ref_name }}${{ github.event_name == 'workflow_dispatch' && format('-{0}', steps.short-sha.outputs.sha) || '' }}-macOS
+          name: Rune-${{ github.ref_name }}${{ github.event_name == 'workflow_dispatch' && format('-{0}', steps.short-sha.outputs.sha) || '' }}-macOS-zip
 
       - name: Clean up
         if: ${{ always() }}

From a437dd107a9dfffad2c638e0f36d5ee24ad7aeb9 Mon Sep 17 00:00:00 2001
From: Ovler <ovlertheyoung@gmail.com>
Date: Tue, 3 Dec 2024 01:07:48 -0500
Subject: [PATCH 2/3] refactor(macos): remove nested ZIP structure for DMG
 artifacts

- Adjusted the workflow to upload MacOS DMG files directly instead of nesting them inside a ZIP.
- Simplified the artifact structure for easier access and usability.
---
 .github/workflows/build.yml | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 3e38928a4..814d42b97 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -383,17 +383,26 @@ jobs:
           install_name_tool -change /opt/homebrew/opt/lmdb/lib/liblmdb.dylib @executable_path/../Frameworks/liblmdb.dylib Rune.app/Contents/MacOS/Rune
         working-directory: build/macos/Build/Products/Release
 
+      - name: Rename DMG
+        run: |
+          mv temp_macos/*.dmg "temp_macos/Rune-${{ github.ref_name }}${{ github.event_name == 'workflow_dispatch' && format('-{0}', steps.short-sha.outputs.sha) || '' }}-macOS.dmg"
+
+      - name: Rename ZIP
+        run: |
+          mv temp_macos/*.zip "temp_macos/Rune-${{ github.ref_name }}${{ github.event_name == 'workflow_dispatch' && format('-{0}', steps.short-sha.outputs.sha) || '' }}-macOS.zip"
+
       - name: Upload artifact macOS DMG
         uses: actions/upload-artifact@v4
         with:
-          path: "temp_macos/*.dmg"
-          name: Rune-${{ github.ref_name }}${{ github.event_name == 'workflow_dispatch' && format('-{0}', steps.short-sha.outputs.sha) || '' }}-macOS
+          path: temp_macos/temp_macos/Rune-${{ github.ref_name }}${{ github.event_name == 'workflow_dispatch' && format('-{0}', steps.short-sha.outputs.sha) || '' }}-macOS.dmg
+          name: Rune-${{ github.ref_name }}${{ github.event_name == 'workflow_dispatch' && format('-{0}', steps.short-sha.outputs.sha) || '' }}-macOS.dmg
 
       - name: Upload artifact macOS ZIP
+        continue-on-error: true
         uses: actions/upload-artifact@v4
         with:
-          path: "temp_macos/*.zip"
-          name: Rune-${{ github.ref_name }}${{ github.event_name == 'workflow_dispatch' && format('-{0}', steps.short-sha.outputs.sha) || '' }}-macOS-zip
+          path: temp_macos/Rune-${{ github.ref_name }}${{ github.event_name == 'workflow_dispatch' && format('-{0}', steps.short-sha.outputs.sha) || '' }}-macOS.zip
+          name: Rune-${{ github.ref_name }}${{ github.event_name == 'workflow_dispatch' && format('-{0}', steps.short-sha.outputs.sha) || '' }}-macOS.zip
 
       - name: Clean up
         if: ${{ always() }}
@@ -404,16 +413,6 @@ jobs:
             security delete-keychain $RUNNER_TEMP/rune-signing.keychain-db
           fi
           rm -f .env
-        
-      - name: Rename DMG
-        if: startsWith(github.ref, 'refs/tags/v')
-        run: |
-          mv temp_macos/*.dmg "temp_macos/Rune-${{ github.ref_name }}-macOS.dmg"
-
-      - name: Rename ZIP
-        if: startsWith(github.ref, 'refs/tags/v')
-        run: |
-          mv temp_macos/*.zip "temp_macos/Rune-${{ github.ref_name }}-macOS.zip"
 
       - name: Release DMG
         uses: ncipollo/release-action@v1

From 9535f95c9bae45404510e745c36de9791468d63a Mon Sep 17 00:00:00 2001
From: Ovler <ovlertheyoung@gmail.com>
Date: Tue, 3 Dec 2024 01:16:31 -0500
Subject: [PATCH 3/3] ci(macos): correct duplicate directory path in DMG
 artifact upload

- Fixed the duplicate 'temp_macos' directory path in the DMG artifact upload step.
---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 814d42b97..af14e4e88 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -394,7 +394,7 @@ jobs:
       - name: Upload artifact macOS DMG
         uses: actions/upload-artifact@v4
         with:
-          path: temp_macos/temp_macos/Rune-${{ github.ref_name }}${{ github.event_name == 'workflow_dispatch' && format('-{0}', steps.short-sha.outputs.sha) || '' }}-macOS.dmg
+          path: temp_macos/Rune-${{ github.ref_name }}${{ github.event_name == 'workflow_dispatch' && format('-{0}', steps.short-sha.outputs.sha) || '' }}-macOS.dmg
           name: Rune-${{ github.ref_name }}${{ github.event_name == 'workflow_dispatch' && format('-{0}', steps.short-sha.outputs.sha) || '' }}-macOS.dmg
 
       - name: Upload artifact macOS ZIP