Update macOS runner to use official binaries
4 files changed, 6 insertions, 5 deletions
diff --git a/.ci/macos/Brewfile b/.ci/macos/Brewfile
index 717447fc..84036fed 100644
--- a/.ci/macos/Brewfile
+++ b/.ci/macos/Brewfile
@@ -6,7 +6,7 @@ brew "clang-format"
brew "cmake"
brew "ninja"
brew "openssl"
-brew "qt6"
+# brew "qt6"
brew "nlohmann_json"
brew "gstreamer"
brew "qtkeychain"
diff --git a/.ci/macos/build.sh b/.ci/macos/build.sh
index aa515186..5e6b1df4 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="$(brew --prefix qt6)/bin/:${PATH}"
+PATH="/Users/jdonof/Qt/6.5.1/macos/bin/:${PATH}"
export PATH
-CMAKE_PREFIX_PATH="$(brew --prefix qt6)"
+CMAKE_PREFIX_PATH="/Users/jdonof/Qt/6.5.1/macos/lib/cmake"
export CMAKE_PREFIX_PATH
cmake -GNinja -S. -Bbuild \
@@ -19,6 +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 \
-DCI_BUILD=ON
cmake --build build
cmake --install build
diff --git a/.ci/macos/notarize.sh b/.ci/macos/notarize.sh
index 33a6da50..2db4fa20 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="/usr/local/opt/qt@6/bin/:${PATH}"
+PATH="/Users/jdonof/Qt/6.5.1/macos/bin/:${PATH}"
export PATH
security unlock-keychain -p "${RUNNER_USER_PW}" login.keychain
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ffa436d3..0dab93df 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -173,7 +173,7 @@ codesign-macos:
before_script:
- pip3 install dmgbuild
script:
- - export PATH=/usr/local/opt/qt@5/bin/:${PATH}
+ - export PATH=/Users/jdonof/Qt/6.5.1/macos/bin:${PATH}
- ./.ci/macos/notarize.sh
after_script:
- ./.ci/upload-nightly-gitlab.sh artifacts/nheko-${CI_COMMIT_SHORT_SHA}-${PLAT}.dmg
|
