Skip to content

Commit da153a9

Browse files
committed
Rework hdiutil detach which causes issues on GH CI.
1 parent 8eff0de commit da153a9

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

packages/darwin_app/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -205,8 +205,8 @@ dmg:
205205
$(MAKE) -C $(packages_src) \
206206
DESTDIR="/Volumes/$(VOLUME_NAME)/*.app/Contents/Resources" doc_format
207207
chmod -R a-w /Volumes/$(VOLUME_NAME)/*.app/Contents/Resources
208-
# 3 retries
209-
hdiutil detach `mount | grep $(VOLUME_NAME) | cut -d ' ' -f 1` || hdiutil detach `mount | grep $(VOLUME_NAME) | cut -d ' ' -f 1` || hdiutil detach `mount | grep $(VOLUME_NAME) | cut -d ' ' -f 1`
208+
# max 5 retries
209+
nretries=5; volm=$$(mount | grep $(VOLUME_NAME) | cut -d ' ' -f 1); sleep 1; until [[ $$nretries -le 0 ]] || hdiutil detach $$volm; do echo "detach failed, retrying"; sleep 1; nretries=$$(expr $$nretries - 1); done
210210
rm -f "$(PACKAGE_NAME).dmg"
211211
hdiutil convert -format UDZO -o "$(PACKAGE_NAME).dmg" build.dmg
212212
rm -f build.dmg

0 commit comments

Comments
 (0)