Skip to content

Commit 2dd8f7d

Browse files
committed
darwin_app: hdiutil create now also causes issues on GH CI.
1 parent 52fae40 commit 2dd8f7d

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

packages/darwin_app/Makefile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -191,6 +191,8 @@ dmg:
191191
rm -f build.dmg
192192
hdiutil create -format UDRW -fs HFS+ -srcfolder "$(BUILD_BASE)" \
193193
-volname $(VOLUME_NAME) build.dmg
194+
# GH runner often fails here, do max 10 retries
195+
nretries=10; until [[ $$nretries -le 0 ]] || hdiutil create -format UDRW -fs HFS+ -srcfolder "$(BUILD_BASE)" -volname $(VOLUME_NAME) build.dmg; do echo "hdiutil create failed, retrying"; sleep 5; nretries=$$(expr $$nretries - 1); done
194196
# detach one with the same name first
195197
-hdiutil detach "/Volumes/$(VOLUME_NAME)"
196198
hdiutil attach build.dmg
@@ -216,8 +218,8 @@ dmg:
216218
$(MAKE) -C $(packages_src) \
217219
DESTDIR="/Volumes/$(VOLUME_NAME)/*.app/Contents/Resources" doc_format
218220
chmod -R a-w /Volumes/$(VOLUME_NAME)/*.app/Contents/Resources
219-
# max 5 retries
220-
nretries=10; volm=$$(mount | grep $(VOLUME_NAME) | cut -d ' ' -f 1); sleep 5; until [[ $$nretries -le 0 ]] || hdiutil detach $$volm; do echo "detach failed, retrying"; sleep 5; nretries=$$(expr $$nretries - 1); done
221+
# max 10 retries
222+
nretries=10; volm=$$(mount | grep $(VOLUME_NAME) | cut -d ' ' -f 1); sleep 5; until [[ $$nretries -le 0 ]] || hdiutil detach $$volm; do echo "hdiutil detach failed, retrying"; sleep 5; nretries=$$(expr $$nretries - 1); done
221223
rm -f "$(PACKAGE_NAME).dmg"
222224
hdiutil convert -format UDZO -o "$(PACKAGE_NAME).dmg" build.dmg
223225
rm -f build.dmg

0 commit comments

Comments
 (0)