Use official qt binaries on cirrus-ci for apple silicon

This commit is contained in:
Joseph Donofry 2023-07-17 18:38:38 -04:00
parent 6909ec1096
commit 8576b2cbe4
No known key found for this signature in database
GPG key ID: E8A1D78EF044B0CB
3 changed files with 9 additions and 5 deletions

View file

@ -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

View file

@ -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

View file

@ -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