From 8576b2cbe4f536d7e781cd5e94634b8c97496228 Mon Sep 17 00:00:00 2001
From: Joseph Donofry <rubberduckie3554@gmail.com>
Date: Mon, 17 Jul 2023 18:38:38 -0400
Subject: [PATCH] Use official qt binaries on cirrus-ci for apple silicon

---
 .ci/macos/build.sh    | 6 +++---
 .ci/macos/notarize.sh | 2 +-
 .cirrus.yml           | 6 +++++-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/.ci/macos/build.sh b/.ci/macos/build.sh
index 5e6b1df4..efc183e8 100755
--- a/.ci/macos/build.sh
+++ b/.ci/macos/build.sh
@@ -6,10 +6,10 @@ set -ue
 #TAG=$(git tag -l --points-at HEAD)
 
 # Add Qt binaries to path
-PATH="/Users/jdonof/Qt/6.5.1/macos/bin/:${PATH}"
+PATH="${HOME}/Qt/6.5.1/macos/bin/:${PATH}"
 export PATH
 
-CMAKE_PREFIX_PATH="/Users/jdonof/Qt/6.5.1/macos/lib/cmake"
+CMAKE_PREFIX_PATH="${HOME}/Qt/6.5.1/macos/lib/cmake"
 export CMAKE_PREFIX_PATH
 
 cmake -GNinja -S. -Bbuild \
@@ -19,7 +19,7 @@ cmake -GNinja -S. -Bbuild \
       -DHUNTER_ENABLED=ON -DBUILD_SHARED_LIBS=OFF \
       -DCMAKE_BUILD_TYPE=RelWithDebInfo -DHUNTER_CONFIGURATION_TYPES=RelWithDebInfo \
       -DUSE_BUNDLED_OPENSSL=ON \
-      -DQt6_DIR=/Users/jdonof/Qt/6.5.1/macos/lib/cmake \
+      -DQt6_DIR=${HOME}/Qt/6.5.1/macos/lib/cmake \
       -DCI_BUILD=ON
 cmake --build build
 cmake --install build
diff --git a/.ci/macos/notarize.sh b/.ci/macos/notarize.sh
index 2db4fa20..b5c83201 100755
--- a/.ci/macos/notarize.sh
+++ b/.ci/macos/notarize.sh
@@ -6,7 +6,7 @@ set -u
 # https://forum.qt.io/topic/96652/how-to-notarize-qt-application-on-macos/18
 
 # Add Qt binaries to path
-PATH="/Users/jdonof/Qt/6.5.1/macos/bin/:${PATH}"
+PATH="${HOME}/Qt/6.5.1/macos/bin/:${PATH}"
 export PATH
 
 security unlock-keychain -p "${RUNNER_USER_PW}" login.keychain
diff --git a/.cirrus.yml b/.cirrus.yml
index 8618b7ee..be20a7e7 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -9,8 +9,12 @@ task:
     - brew update-reset
     - unset HOMEBREW_NO_AUTO_UPDATE
     - brew bundle --file .ci/macos/Brewfile
+  aqt_script:
+    - pip install aqtinstall
+    - mkdir $HOME/Qt
+    - aqt install-qt --outputdir $HOME/qt mac desktop 6.5.1 clang_64 -m all
   build_script:
-    - export PATH="$(brew --prefix qt5)/bin/:${PATH}"
+    - export PATH="${HOME}/Qt/6.5.1/macos/bin:${PATH}"
     - ./.ci/macos/build.sh
   zip_script:
     - ditto -c -k --sequesterRsrc --keepParent nheko.app nheko.zip