mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-08-23 10:50:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix macOS CI

Browse source
This commit is contained in:
Nikhil Narayana 2023-08-17 22:37:34 -07:00
commit 6ef58fad31
No known key found for this signature in database
GPG key ID: 1B34839FA8D6245E
2 changed files with 15 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

24
.github/workflows/main.yml vendored
View file

@ -8,7 +8,9 @@ on:
- "**.md"
- "**.ini"
pull_request:
branches: [ master ]
branches:
- master
- task/update
paths-ignore:
- "**.md"
- "**.ini"
@ -232,15 +234,15 @@ jobs:
echo "GIT_HASH=$(git rev-parse --short HEAD)" >> $GITHUB_ENV
echo "GIT_TAG=$(git describe --tags --abbrev=0)" >> $GITHUB_ENV
echo "CURR_DATE=$(date +%Y-%m-%d)" >> $GITHUB_ENV
- name: "Install 10.14 SDK"
if: success()
shell: bash
working-directory: ${{ github.workspace }}
run: |
wget https://github.com/phracker/MacOSX-SDKs/releases/download/10.15/MacOSX10.14.sdk.tar.xz
tar -xf MacOSX10.14.sdk.tar.xz
rm MacOSX10.14.sdk.tar.xz
sudo mv MacOSX10.14.sdk /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/
# - name: "Install 10.14 SDK"
# if: success()
# shell: bash
# working-directory: ${{ github.workspace }}
# run: |
# wget https://github.com/phracker/MacOSX-SDKs/releases/download/10.15/MacOSX10.14.sdk.tar.xz
# tar -xf MacOSX10.14.sdk.tar.xz
# rm MacOSX10.14.sdk.tar.xz
# sudo mv MacOSX10.14.sdk /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/
- name: "Download and Install prerequisites"
if: success()
shell: bash
@ -255,7 +257,7 @@ jobs:
libao \
sound-touch \
hidapi \
qt@5
qt@6
- name: "Build ${{ matrix.build_type }} Dolphin"
if: success()
shell: bash

4
build-mac.sh
View file

@ -1,8 +1,8 @@
#!/bin/bash -e
# build-mac.sh
QT_BREW_PATH=$(brew --prefix qt@5)
CMAKE_FLAGS="-DQt5_DIR=${QT_BREW_PATH}/lib/cmake/Qt5 -DENABLE_NOGUI=false"
QT_BREW_PATH=$(brew --prefix qt@6)
CMAKE_FLAGS="-DQT_DIR=${QT_BREW_PATH}/lib/cmake/Qt5 -DENABLE_NOGUI=false"
PLAYBACK_CODES_PATH="./Data/PlaybackGeckoCodes/"