updated mac build

labbots · May 28, 2024 · 7085901 · 7085901
1 parent 075a779
commit 7085901
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/.github/workflows/_build-macos.yaml b/.github/workflows/_build-macos.yaml
@@ -45,8 +45,12 @@ jobs:
         run: poetry run pyinstaller spec_files/ui_app/NiimPrintX-mac.spec --noconfirm --clean
 
       - name: Avoid a race condition in cpack
+        if: input.os == 'macos-13'
         run: |
-          sudo pkill -9 XProtect >/dev/null || true;
+          # TODO: Replace this with a better solution
+          # See https://github.com/actions/runner-images/issues/7522
+          echo Killing XProtect...; sudo pkill -9 XProtect >/dev/null || true;
+          echo Waiting for XProtect process...; while pgrep XProtect; do sleep 3; done;
 
       - name: Create DMG package
         run: ./.github/workflows/mac-dmg-builder.sh "${{ steps.get_tag_name.outputs.VERSION }}" "${{ steps.get_architecture.outputs.ARCH }}"

diff --git a/.github/workflows/mac-dmg-builder.sh b/.github/workflows/mac-dmg-builder.sh
@@ -33,5 +33,6 @@ sudo create-dmg \
   --hide-extension "${APP_NAME}.app" \
   --app-drop-link 600 185 \
   --no-internet-enable \
+  --hdiutil-verbose \
   "${DMG_FILE_NAME}" \
   "${SOURCE_FOLDER_PATH}"