File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change 1+ #! /usr/bin/env bash
2+
3+ # Basic shell script to retry creating DMG as Azure is buggy
4+ # https://github.com/actions/runner-images/issues/7522
5+
6+ echo " Attempting to create Apple DMG"
7+ for i in {1..10}; do
8+ if /usr/bin/sudo /usr/bin/hdiutil create macbuild.dmg -volname " OpenBVE" -fs HFS+ -srcfolder " mac/OpenBVE.app" ; then
9+ echo " Successfully created DMG on attempt $i "
10+ break
11+ elif [[ $i -eq 10 ]]; then
12+ echo " Failed to create DMG after $i attempts"
13+ exit 1
14+ else
15+ echo " Failed to create DMG on attempt $i , retrying"
16+ fi
17+ done
Original file line number Diff line number Diff line change @@ -161,9 +161,9 @@ $(MAC_BUILD_RESULT): all-release
161161 @echo $(COLOR_RED)Copying build data into $(COLOR_CYAN)OpenBVE.app$(COLOR_END)
162162 @cp -r $(RELEASE_DIR)/* mac/OpenBVE.app/Contents/Resources/
163163
164- # Because Azure is iffy on MacOS13, try creating DMG as root....
164+ # Because Azure is iffy on MacOS13, let's try a custom script
165165 @echo $(COLOR_RED)Creating $(COLOR_CYAN)$(MAC_BUILD_RESULT)$(COLOR_END)
166- @/usr/bin/sudo /usr/bin/hdiutil create $(MAC_BUILD_RESULT) -volname "OpenBVE" -fs HFS+ -srcfolder "mac/OpenBVE.app"
166+ @./DMGScript.sh
167167 @echo Renaming final output file
168168ifeq (, $(PROGRAM_VERSION ) )
169169 @echo This is a $(COLOR_BLUE)Daily build$(COLOR_END)
Original file line number Diff line number Diff line change @@ -284,6 +284,7 @@ private static void Main(string[] args) {
284284 SetProcessDPIAware ( ) ;
285285 }
286286
287+ result . ExperimentalGLMenu = true ;
287288 if ( result . ExperimentalGLMenu )
288289 {
289290 result . Start = true ;
You can’t perform that action at this time.
0 commit comments