Merge pull request #2784 from Calinou/github-actions-use-ninja

Use Ninja for macOS builds on GitHub Actions
This commit is contained in:
Connor McLaughlin 2021-12-30 14:45:12 +10:00 committed by GitHub
commit a7bb590208
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -271,7 +271,7 @@ jobs:
mkdir build
cd build
cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_NOGUI_FRONTEND=ON -DBUILD_QT_FRONTEND=ON -DUSE_DRMKMS=ON -DUSE_EGL=ON -DUSE_SDL2=ON -DUSE_WAYLAND=ON -DUSE_X11=ON -G Ninja ..
ninja
cmake --build . --parallel
../scripts/generate_appimages.sh $(pwd)
- name: Upload NoGUI AppImage
@ -309,7 +309,7 @@ jobs:
- name: Install packages
shell: bash
run: |
brew install qt5 sdl2 curl
brew install qt5 sdl2 curl ninja
- name: Clone mac externals
shell: bash
@ -322,8 +322,8 @@ jobs:
mkdir build
cd build
export MACOSX_DEPLOYMENT_TARGET=10.14
cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_NOGUI_FRONTEND=OFF -DBUILD_QT_FRONTEND=ON -DUSE_SDL2=ON -DQt5_DIR=/usr/local/opt/qt@5/lib/cmake/Qt5 ..
cmake --build . --parallel 2
cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_NOGUI_FRONTEND=OFF -DBUILD_QT_FRONTEND=ON -DUSE_SDL2=ON -DQt5_DIR=/usr/local/opt/qt@5/lib/cmake/Qt5 -G Ninja ..
cmake --build . --parallel
cd bin
zip -r duckstation-mac-release.zip DuckStation.app/
@ -413,4 +413,3 @@ jobs:
linux-x64-appimage-nogui-zsync/duckstation-nogui-x64.AppImage.zsync
linux-x64-appimage-qt/duckstation-qt-x64.AppImage
linux-x64-appimage-qt-zsync/duckstation-qt-x64.AppImage.zsync