mirror of https://github.com/PCSX2/pcsx2.git
CI: Swap to MacOS 14 runner
This commit is contained in:
parent
18e3a9987e
commit
e20984a5f7
|
@ -12,7 +12,7 @@ on:
|
||||||
os:
|
os:
|
||||||
required: false
|
required: false
|
||||||
type: string
|
type: string
|
||||||
default: macos-13
|
default: macos-14
|
||||||
patchesUrl:
|
patchesUrl:
|
||||||
required: false
|
required: false
|
||||||
type: string
|
type: string
|
||||||
|
@ -74,14 +74,12 @@ jobs:
|
||||||
|
|
||||||
- name: Install Packages
|
- name: Install Packages
|
||||||
env:
|
env:
|
||||||
PLATFORM: "x64"
|
|
||||||
HOMEBREW_NO_INSTALL_CLEANUP: 1
|
HOMEBREW_NO_INSTALL_CLEANUP: 1
|
||||||
HOMEBREW_NO_ANALYTICS: 1
|
HOMEBREW_NO_ANALYTICS: 1
|
||||||
run: |
|
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 ccache nasm; then
|
||||||
if ! brew install molten-vk ccache nasm; then
|
|
||||||
brew update
|
brew update
|
||||||
brew install molten-vk ccache nasm
|
brew install ccache nasm
|
||||||
fi
|
fi
|
||||||
|
|
||||||
- name: Cache Dependencies
|
- name: Cache Dependencies
|
||||||
|
@ -117,11 +115,10 @@ jobs:
|
||||||
run: |
|
run: |
|
||||||
cmake -DCMAKE_PREFIX_PATH="$HOME/deps" \
|
cmake -DCMAKE_PREFIX_PATH="$HOME/deps" \
|
||||||
-DCMAKE_BUILD_TYPE=Release \
|
-DCMAKE_BUILD_TYPE=Release \
|
||||||
|
-DCMAKE_OSX_ARCHITECTURES="x86_64" \
|
||||||
-DUSE_OPENGL=OFF \
|
-DUSE_OPENGL=OFF \
|
||||||
-DDISABLE_ADVANCE_SIMD=ON \
|
-DDISABLE_ADVANCE_SIMD=ON \
|
||||||
-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON \
|
-DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON \
|
||||||
-DUSE_SYSTEM_LIBS=OFF \
|
|
||||||
-DUSE_SYSTEM_SDL2=ON \
|
|
||||||
-DUSE_LINKED_FFMPEG=ON \
|
-DUSE_LINKED_FFMPEG=ON \
|
||||||
-DCMAKE_C_COMPILER_LAUNCHER=ccache \
|
-DCMAKE_C_COMPILER_LAUNCHER=ccache \
|
||||||
-DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
|
-DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
|
||||||
|
|
Loading…
Reference in New Issue