diff options
| author | Nicolas Werner <nicolas.werner@hotmail.de> | 2023-06-09 01:51:11 +0200 |
|---|---|---|
| committer | Nicolas Werner <nicolas.werner@hotmail.de> | 2023-06-09 01:51:11 +0200 |
| commit | 885168c08fc1b27805342b3485aabade1f30900a (patch) | |
| tree | 8e43ec6ab24714f3e70dbe3e091a3ed3f8530891 | |
| parent | Make settings combobox width dependent on content (diff) | |
| download | nheko-885168c08fc1b27805342b3485aabade1f30900a.tar.xz | |
Use qt6 prefix to build macos packages
| -rwxr-xr-x | .ci/macos/build.sh | 6 | ||||
| -rwxr-xr-x | .ci/macos/notarize.sh | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/.ci/macos/build.sh b/.ci/macos/build.sh index 40ab2571..1d703a85 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 qt5):${PATH}" +PATH="$(brew --prefix qt6):${PATH}" export PATH -CMAKE_PREFIX_PATH="$(brew --prefix qt5)" +CMAKE_PREFIX_PATH="$(brew --prefix qt6)" export CMAKE_PREFIX_PATH cmake -GNinja -S. -Bbuild \ @@ -28,5 +28,5 @@ cmake --build build make -j 4 cp libqtjdenticon.dylib ../nheko.app/Contents/MacOS ) - "$(brew --prefix qt5)/bin/macdeployqt" nheko.app -always-overwrite -qmldir=../resources/qml/ + "$(brew --prefix qt6)/bin/macdeployqt" nheko.app -always-overwrite -qmldir=../resources/qml/ ) diff --git a/.ci/macos/notarize.sh b/.ci/macos/notarize.sh index 345f4828..6dc057bc 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@5/bin/:${PATH}" +PATH="/usr/local/opt/qt@6/bin/:${PATH}" export PATH security unlock-keychain -p "${RUNNER_USER_PW}" login.keychain @@ -100,4 +100,4 @@ if [ -n "$VERSION" ]; then mv nheko.dmg "nheko-${VERSION}-${PLAT}.dmg" mkdir -p artifacts cp "nheko-${VERSION}-${PLAT}.dmg" artifacts/ -fi \ No newline at end of file +fi |