Use qt6 prefix to build macos packages

This commit is contained in:
Nicolas Werner 2023-06-09 01:51:11 +02:00
parent 8259891a42
commit 885168c08f
No known key found for this signature in database
GPG key ID: C8D75E610773F2D9
2 changed files with 5 additions and 5 deletions

View file

@ -6,10 +6,10 @@ set -ue
#TAG=$(git tag -l --points-at HEAD) #TAG=$(git tag -l --points-at HEAD)
# Add Qt binaries to path # Add Qt binaries to path
PATH="$(brew --prefix qt5):${PATH}" PATH="$(brew --prefix qt6):${PATH}"
export PATH export PATH
CMAKE_PREFIX_PATH="$(brew --prefix qt5)" CMAKE_PREFIX_PATH="$(brew --prefix qt6)"
export CMAKE_PREFIX_PATH export CMAKE_PREFIX_PATH
cmake -GNinja -S. -Bbuild \ cmake -GNinja -S. -Bbuild \
@ -28,5 +28,5 @@ cmake --build build
make -j 4 make -j 4
cp libqtjdenticon.dylib ../nheko.app/Contents/MacOS 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/
) )

View file

@ -6,7 +6,7 @@ set -u
# https://forum.qt.io/topic/96652/how-to-notarize-qt-application-on-macos/18 # https://forum.qt.io/topic/96652/how-to-notarize-qt-application-on-macos/18
# Add Qt binaries to path # Add Qt binaries to path
PATH="/usr/local/opt/qt@5/bin/:${PATH}" PATH="/usr/local/opt/qt@6/bin/:${PATH}"
export PATH export PATH
security unlock-keychain -p "${RUNNER_USER_PW}" login.keychain security unlock-keychain -p "${RUNNER_USER_PW}" login.keychain
@ -100,4 +100,4 @@ if [ -n "$VERSION" ]; then
mv nheko.dmg "nheko-${VERSION}-${PLAT}.dmg" mv nheko.dmg "nheko-${VERSION}-${PLAT}.dmg"
mkdir -p artifacts mkdir -p artifacts
cp "nheko-${VERSION}-${PLAT}.dmg" artifacts/ cp "nheko-${VERSION}-${PLAT}.dmg" artifacts/
fi fi