Merge pull request #32 from fwcd/macos-13

Build on macOS 13 in CI
fwcd · Jul 6, 2024 · 423d026 · 423d026
2 parents 2f05902 + d33a6d5
commit 423d026
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 4 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -14,14 +14,15 @@ env:
   VCPKG_ROOT: '${{ github.workspace }}/vcpkg'
   MIXXX_ROOT: '${{ github.workspace }}/mixxx'
   SCRIPTS_ROOT: '${{ github.workspace }}/scripts'
+  XCODE_ROOT: /Applications/Xcode_15.2.app
 
 jobs:
   build:
     strategy:
       matrix:
         include:
         - name: macOS (arm64)
-          os: macos-11
+          os: macos-13
           suffix: ''
           triplet: arm64-osx-min1100-release
           host_triplet: x64-osx-min1100-release
@@ -31,7 +32,7 @@ jobs:
           cmake_args: >-
             -DMACOS_BUNDLE=ON
         - name: macOS (x86_64)
-          os: macos-11
+          os: macos-13
           suffix: ''
           triplet: x64-osx-min1100-release
           host_triplet: x64-osx-min1100-release
@@ -41,7 +42,7 @@ jobs:
           cmake_args: >-
             -DMACOS_BUNDLE=ON
         - name: macOS (arm64, Debug Assertions)
-          os: macos-11
+          os: macos-13
           suffix: '-debugasserts'
           triplet: arm64-osx-min1100-release
           host_triplet: x64-osx-min1100-release
@@ -52,7 +53,7 @@ jobs:
             -DDEBUG_ASSERTIONS_FATAL=ON
             -DMACOS_BUNDLE=ON
         - name: macOS (x86_64, Debug Assertions)
-          os: macos-11
+          os: macos-13
           suffix: '-debugasserts'
           triplet: x64-osx-min1100-release
           host_triplet: x64-osx-min1100-release
@@ -100,6 +101,8 @@ jobs:
       with:
         fetch-depth: '0' # to compute the monotonic version correctly
         submodules: true
+    - name: Output runner info
+      run: uname -a
     - name: Fetch versions and paths
       run: |
         for mod in "${{ env.VCPKG_ROOT }}" "${{ env.MIXXX_ROOT }}"; do
@@ -115,7 +118,30 @@ jobs:
       if: runner.os == 'macOS'
       run: |
         ${{ env.SCRIPTS_ROOT }}/install-macos-deps
+        sudo xcode-select -s "${{ env.XCODE_ROOT }}"
+        echo "==> Build environment"
+        xcode-select -p
         xcrun --show-sdk-version
+    # TODO: Replace this with a better solution
+    # See https://github.com/actions/runner-images/issues/7522
+    - name: Disable XProtect to work around race condition in CPack
+      if: runner.os == 'macOS'
+      run: |
+        set +e
+        set -x
+        daemons=(
+          com.apple.XProtect.daemon.scan
+          com.apple.XprotectFramework.PluginService
+          com.apple.XprotectFramework.scan
+          com.apple.metadata.mds
+          com.apple.metadata.mds.index
+        )
+        for daemon in "${daemons[@]}"; do
+          sudo launchctl stop "$daemon"
+          echo "  -> $?"
+          sudo launchctl disable "system/$daemon"
+          echo "  -> $?"
+        done
 
     # TODO: Remove this workaround once CMake in GitHub's runner image is
     # updated to 3.29.2, i.e. the `PACKAGE_PREFIX_DIR` issue is fixed again (the

diff --git a/scripts/install-macos-deps b/scripts/install-macos-deps
@@ -10,8 +10,10 @@ fi
 echo "==> Installing system dependencies with Homebrew..."
 brew install \
   automake \
+  autoconf \
   autoconf-archive \
   ccache \
+  libtool \
   nasm \
   ninja \
   pkg-config