Skip to content

Commit ff1586f

Browse files
committed
Change: Attempted workaround for MacOS13 hdiutil issues
1 parent 0571d4e commit ff1586f

4 files changed

+11
-1
lines changed

azure-pipelines-1.yml

+3
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,9 @@ jobs:
4747
buildConfiguration: 'Release'
4848

4949
steps:
50+
- script: |
51+
echo killing...; sudo pkill -9 XProtect >/dev/null || true;
52+
echo waiting...; while pgrep XProtect; do sleep 3; done;
5053
- task: NuGetToolInstaller@1
5154
- script: make publish
5255

azure-pipelines-release.yml

+3
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,9 @@ jobs:
5959
buildConfiguration: 'Release'
6060

6161
steps:
62+
- script: |
63+
echo killing...; sudo pkill -9 XProtect >/dev/null || true;
64+
echo waiting...; while pgrep XProtect; do sleep 3; done;
6265
- task: NuGetToolInstaller@1
6366
- script: make publish
6467
- task: CopyFilesOverSSH@0

azure-pipelines.yml

+3
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,9 @@ jobs:
4242
buildConfiguration: 'Release'
4343

4444
steps:
45+
- script: |
46+
echo killing...; sudo pkill -9 XProtect >/dev/null || true;
47+
echo waiting...; while pgrep XProtect; do sleep 3; done;
4548
- task: NuGetToolInstaller@1
4649
- script: make publish
4750
- task: CopyFilesOverSSH@0

makefile

+2-1
Original file line numberDiff line numberDiff line change
@@ -161,8 +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....
164165
@echo $(COLOR_RED)Creating $(COLOR_CYAN)$(MAC_BUILD_RESULT)$(COLOR_END)
165-
@hdiutil create $(MAC_BUILD_RESULT) -volname "OpenBVE" -fs HFS+ -srcfolder "mac/OpenBVE.app"
166+
@/usr/bin/sudo /usr/bin/hdiutil create $(MAC_BUILD_RESULT) -volname "OpenBVE" -fs HFS+ -srcfolder "mac/OpenBVE.app"
166167
@echo Renaming final output file
167168
ifeq (, $(PROGRAM_VERSION))
168169
@echo This is a $(COLOR_BLUE)Daily build$(COLOR_END)

0 commit comments

Comments
 (0)