From 5e3e12404aa87712d932f0adf26e6f6d60c7a476 Mon Sep 17 00:00:00 2001
From: Michael Herger <michael@herger.net>
Date: Tue, 10 Sep 2024 14:57:43 +0200
Subject: [PATCH] Have new macOS package use .dmg rather than .zip files

---
 .github/actions/build/action.yaml | 10 ++++++++--
 Slim/Utils/OS/OSX.pm              |  2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/.github/actions/build/action.yaml b/.github/actions/build/action.yaml
index d98a31c1af..dcb1938d90 100644
--- a/.github/actions/build/action.yaml
+++ b/.github/actions/build/action.yaml
@@ -57,7 +57,7 @@ runs:
 
 
     - name: Set up macOS environment
-      if: ${{ startsWith(inputs.build-params, 'macos') }}
+      if: ${{ inputs.build-params == 'macos' }}
       shell: bash
       run: |
         # set up Platypus - see https://github.com/sveinbjornt/Platypus/issues/270#issuecomment-2312235079
@@ -76,7 +76,7 @@ runs:
         sudo chmod +x /usr/local/bin/platypus
 
         # required by create-dmg if we want to get a customized icon
-        brew install graphicsmagick imagemagick
+        brew install -q graphicsmagick imagemagick
 
 
     - name: Set up Windows environment
@@ -139,3 +139,9 @@ runs:
         done
 
         rm -f $HOME/.aws/credentials
+
+    - name: Archive artifacts
+      uses: actions/upload-artifact@v4
+      with:
+        name: ${{ inputs.build-params }}
+        path: publish
diff --git a/Slim/Utils/OS/OSX.pm b/Slim/Utils/OS/OSX.pm
index a5fb02af65..0a5801c7c5 100644
--- a/Slim/Utils/OS/OSX.pm
+++ b/Slim/Utils/OS/OSX.pm
@@ -451,7 +451,7 @@ sub installerExtension {
 	if (IS_MENUBAR_ITEM) {
 		# remove pref pane installer
 		Slim::Utils::Misc::deleteFiles($updateFolder, qr/^LyrionMusicServer.*\.pkg$/i);
-		return 'zip';
+		return 'dmg';
 	};
 
 	# remove menu bar item installer