From 5fe7f186d39ddd0db7210f7f5bf48ea2e6021162 Mon Sep 17 00:00:00 2001
From: BruebachL <44814898+BruebachL@users.noreply.github.com>
Date: Mon, 2 Nov 2026 07:01:55 +0100
Subject: [PATCH] [CI] Make the hdiutil retry wrapper report failure (#7643)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* [CI] Make the hdiutil retry wrapper report failure

CPack reads the wrapper's exit status to decide whether the disk image was
created, so a zero exit turns a failed hdiutil into a later "Problem copying
the package" error that hides hdiutil's own message.

- Propagate hdiutil's real status instead of collapsing every failure to 1.
- Name the failing subcommand (create/attach/detach/convert) so the message
  says which CPack step gave up.
- Count attempts rather than failures in the retry line.

* Update .ci/compile.sh

Co-authored-by: tooomm <tooomm@users.noreply.github.com>

---------

Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de>
Co-authored-by: tooomm <tooomm@users.noreply.github.com>
---
 .ci/compile.sh | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/.ci/compile.sh b/.ci/compile.sh
index bf5a169af..9be8ba741 100755
--- a/.ci/compile.sh
+++ b/.ci/compile.sh
@@ -311,16 +311,24 @@ if [[ $RUNNER_OS == macOS ]]; then
 
   if [[ $MAKE_PACKAGE ]]; then
     # Workaround https://github.com/actions/runner-images/issues/7522
-    # have hdiutil repeat the command 10 times in hope of success
+    # have hdiutil repeat the command 10 times in hope of success.
+    # The wrapper has to exit non-zero once it gives up: CPack reads that status to
+    # decide whether the disk image was created, so a zero exit turns a failed hdiutil
+    # into a much later, misleading "Problem copying the package" error that hides
+    # hdiutil's own message.
     hdiutil_script="/tmp/hdiutil.sh"
     # shellcheck disable=SC2016
     echo '#!/bin/bash
+    attempts=10
     i=0
-    while ! hdiutil "$@"; do
-      if (( ++i >= 10 )); then
-        echo "Error: hdiutil failed $i times!" >&2
-        break
+    while true; do
+      hdiutil "$@" && exit 0
+      rc=$?
+      if (( ++i >= attempts )); then
+        echo "::error::hdiutil $1 failed $i times (last status $rc), giving up" >&2
+        exit "$rc"
       fi
+      echo "hdiutil $1 attempt $i/$attempts failed (status $rc), retrying" >&2
       sleep 1
     done' >"$hdiutil_script"
     chmod +x "$hdiutil_script"