From c72ed95a8191c26d8727fa0ab70aad81abf52f5c Mon Sep 17 00:00:00 2001
From: Chocobo1 <Chocobo1@users.noreply.github.com>
Date: Tue, 22 Jul 2025 15:39:05 +0800
Subject: [PATCH] GHA CI: fix broken retry when packaging for macOS

Failed CI instance: https://github.com/qbittorrent/qBittorrent/actions/runs/16437290836/job/46449723244
Follow up bb1c02125b30eeb537f8e840f2f29364258fc7d9.
---
 .github/workflows/ci_macos.yaml | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/ci_macos.yaml b/.github/workflows/ci_macos.yaml
index 33737d09d..0b288400e 100644
--- a/.github/workflows/ci_macos.yaml
+++ b/.github/workflows/ci_macos.yaml
@@ -122,25 +122,24 @@ jobs:
 
       - name: Prepare build artifacts
         run: |
-          # create .dmg
           appName="qbittorrent"
           if [ "${{ matrix.qbt_gui }}" = "GUI=OFF" ]; then
             appName="qbittorrent-nox"
           fi
-          # package
           pushd build
+          # packaging
+          macdeployqt "$appName.app" -no-strip
+          # code signing
+          xattr -cr "$appName.app"
+          codesign --force --sign - --options runtime \
+            "$appName.app" \
+            "$appName.app/Contents/Frameworks"/* \
+            "$appName.app/Contents/MacOS/$appName"
+          codesign --verify --deep --strict -v "$appName.app"
+          # create .dmg
           PACKAGE_RETRY=0
           while [ "$PACKAGE_RETRY" -lt "3" ]; do
-            macdeployqt "$appName.app" -no-strip
-            # sign
-            xattr -cr "$appName.app"
-            codesign --force --sign - --options runtime \
-              "$appName.app/Contents/Frameworks"/* \
-              "$appName.app/Contents/MacOS/$appName" \
-              "$appName.app"
-            codesign --verify --deep --strict -v "$appName.app"
-            hdiutil create -fs HFS+ -srcfolder "$appName.app" -volname "$appName" "$appName.dmg"
-            if [ -f "$appName.dmg" ]; then
+            if hdiutil create -fs HFS+ -srcfolder "$appName.app" -volname "$appName" "$appName.dmg"; then
               break
             fi
             sleep 5