Skip to content
Python

DMG build: retry the detach, and fail when no image was written

Rohit C Prasad7d3b16113218
diff --git a/packaging/build_dmg.sh b/packaging/build_dmg.sh
index 516e5a04..7321c922 100755
--- a/packaging/build_dmg.sh
+++ b/packaging/build_dmg.sh
@@ -228,15 +228,24 @@ OSA
local i; for i in $(seq 1 15); do [ -f "$mnt/.DS_Store" ] && break; sleep 1; done
[ -f "$mnt/.DS_Store" ] || { hdiutil detach "$dev" -force >/dev/null 2>&1 || true; return 1; }
sync; sync
- hdiutil detach "$dev" -force >/dev/null
- hdiutil convert "$rw" -format UDZO -imagekey zlib-level=9 -o "$DMG" >/dev/null
+ # Finder lets go of the volume a moment after it is done writing; on the GitHub Intel
+ # runner that moment came after our detach ("couldn't eject - Resource busy", then
+ # "convert failed - Resource temporarily unavailable"). Ask again for up to a minute.
+ for i in $(seq 1 20); do
+ hdiutil detach "$dev" >/dev/null 2>&1 && break
+ sleep 3
+ [ "$i" -lt 20 ] || hdiutil detach "$dev" -force >/dev/null 2>&1 || return 1
+ done
+ hdiutil convert "$rw" -format UDZO -imagekey zlib-level=9 -o "$DMG" >/dev/null || return 1
rm -f "$rw"
+ [ -f "$DMG" ]
}
if ! style_dmg; then
echo " (Finder styling unavailable — writing a plain .dmg)"
hdiutil create -volname "$APP" -srcfolder "$STAGING" -ov -format UDZO "$DMG" >/dev/null
fi
+[ -f "$DMG" ] || { echo "ERROR: no .dmg was written" >&2; exit 1; }
rm -rf "$STAGING"
if [ "${OCW_SKIP_NOTARIZE:-}" = "1" ] && [ -n "${APPLE_SIGNING_IDENTITY:-}" ]; then