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.
Losses · Dec 3, 2024 · a437dd1 · a437dd1
1 parent a8a2a17
commit a437dd1
Showing 1 changed file with 13 additions and 14 deletions.
diff --git 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