From 6ef58fad31e2912ce2c378501854e995ecd38176 Mon Sep 17 00:00:00 2001
From: Nikhil Narayana <nikhil.narayana@live.com>
Date: Thu, 17 Aug 2023 22:37:34 -0700
Subject: [PATCH] fix macOS CI

---
 .github/workflows/main.yml | 24 +++++++++++++-----------
 build-mac.sh               |  4 ++--
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 70d2540907..c2b5ccc075 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -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
diff --git a/build-mac.sh b/build-mac.sh
index dde676dbe8..470255b3fe 100644
--- a/build-mac.sh
+++ b/build-mac.sh
@@ -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/"