fixup! release: add Mac OSX installer build

Sometimes the Makefile process is too fast and the `hdiutil` command fails with: hdiutil: create failed - Resource busy A couple moments later that command would succeed, though. So let's just try again after sleeping 5s. Signed-off-by: Johannes Schindelin <[email protected]>
microsoft · Nov 4, 2023 · 55112d2 · 55112d2
1 parent 3cadb39
commit 55112d2
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/.github/macos-installer/Makefile b/.github/macos-installer/Makefile
@@ -114,7 +114,10 @@ disk-image/git-$(VERSION)-$(ARCH_UNIV).pkg: disk-image/VERSION-$(VERSION)-$(ARCH
 	$(pkg_cmd)
 
 git-%-$(ARCH_UNIV).dmg:
-	hdiutil create git-$(VERSION)-$(ARCH_UNIV).uncompressed.dmg -fs HFS+ -srcfolder disk-image -volname "Git $(VERSION) $(ARCH_UNIV)" -ov
+	hdiutil create git-$(VERSION)-$(ARCH_UNIV).uncompressed.dmg -fs HFS+ -srcfolder disk-image -volname "Git $(VERSION) $(ARCH_UNIV)" -ov 2>&1 | tee err || { \
+		grep "Resource busy" err && \
+		sleep 5 && \
+		hdiutil create git-$(VERSION)-$(ARCH_UNIV).uncompressed.dmg -fs HFS+ -srcfolder disk-image -volname "Git $(VERSION) $(ARCH_UNIV)" -ov; }
 	hdiutil convert -format UDZO -o $@ git-$(VERSION)-$(ARCH_UNIV).uncompressed.dmg
 	rm -f git-$(VERSION)-$(ARCH_UNIV).uncompressed.dmg