From 0a8d2d51d15e06d9243cc6861c36a0722a0edb31 Mon Sep 17 00:00:00 2001 From: Stenzek Date: Mon, 5 Feb 2024 01:34:42 +1000 Subject: [PATCH] CI: Swap to MacOS 14 runner --- .github/workflows/macos_build.yml | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/.github/workflows/macos_build.yml b/.github/workflows/macos_build.yml index 0560ed9f23..4f9941af22 100644 --- a/.github/workflows/macos_build.yml +++ b/.github/workflows/macos_build.yml @@ -12,7 +12,7 @@ on: os: required: false type: string - default: macos-13 + default: macos-14 patchesUrl: required: false type: string @@ -74,14 +74,12 @@ jobs: - name: Install Packages env: - PLATFORM: "x64" HOMEBREW_NO_INSTALL_CLEANUP: 1 HOMEBREW_NO_ANALYTICS: 1 run: | - # Unlike other packages, brew's MoltenVK build uses MoltenVK's minimum macOS version of 10.13 so we can use it - if ! brew install molten-vk ccache nasm; then + if ! brew install ccache nasm; then brew update - brew install molten-vk ccache nasm + brew install ccache nasm fi - name: Cache Dependencies @@ -117,11 +115,10 @@ jobs: run: | cmake -DCMAKE_PREFIX_PATH="$HOME/deps" \ -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_OSX_ARCHITECTURES="x86_64" \ -DUSE_OPENGL=OFF \ -DDISABLE_ADVANCE_SIMD=ON \ -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON \ - -DUSE_SYSTEM_LIBS=OFF \ - -DUSE_SYSTEM_SDL2=ON \ -DUSE_LINKED_FFMPEG=ON \ -DCMAKE_C_COMPILER_LAUNCHER=ccache \ -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \