mirror of
https://github.com/Nheko-Reborn/nheko.git
synced 2024-10-30 09:30:47 +03:00
Update macOS runner to use official binaries
This commit is contained in:
parent
d08535efbb
commit
6909ec1096
4 changed files with 6 additions and 5 deletions
|
@ -6,7 +6,7 @@ brew "clang-format"
|
|||
brew "cmake"
|
||||
brew "ninja"
|
||||
brew "openssl"
|
||||
brew "qt6"
|
||||
# brew "qt6"
|
||||
brew "nlohmann_json"
|
||||
brew "gstreamer"
|
||||
brew "qtkeychain"
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue