From dd8e77184f3cc238e8cbd06774dc8b49139d26a3 Mon Sep 17 00:00:00 2001
From: EtienneLescot <etiennelescot@gmail.com>
Date: Thu, 29 Oct 2026 16:10:54 +0100
Subject: [PATCH] ci: retry validating the stapled macOS DMG when Apple drops
 the connection

---
 .github/workflows/build.yml | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 32424cf6d..d97491120 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -685,9 +685,16 @@ jobs:
 
       - name: Validate stapled DMG
         if: steps.signing.outputs.enabled == 'true'
+        # validate queries Apple too and fails the same way (error 68); retry it like staple.
         run: |
-          xcrun stapler validate "${{ steps.dmg.outputs.dmg_path }}"
+          for attempt in 1 2 3 4 5; do
+            xcrun stapler validate "${{ steps.dmg.outputs.dmg_path }}" && break
+            [ "$attempt" -eq 5 ] && exit 1
+            echo "Validate attempt $attempt failed, retrying in 30 s"
+            sleep 30
+          done
           spctl -a -vv -t install "${{ steps.dmg.outputs.dmg_path }}"
+        timeout-minutes: 10
 
       - name: Upload macOS DMG
         uses: actions/upload-artifact@v7