d3v1l/matrixion
1
0
Fork 0
mirror of https://github.com/Nheko-Reborn/nheko.git synced 2024-11-22 03:00:46 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix macos builds with newer icu

Browse source
This commit is contained in:
Nicolas Werner 2023-11-06 20:49:54 +01:00
parent 63a2d4b4bb
commit 31aebb33ae
No known key found for this signature in database
GPG key ID: C8D75E610773F2D9
4 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
.ci/macos/build.sh
View file

@ -1,4 +1,4 @@
#!/usr/bin/env sh #!/usr/bin/env bash
set -ue set -ue
@ -6,10 +6,11 @@ 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="${HOME}/Qt/6.5.1/macos/bin/:${PATH}" QT_BASEPATH=(${HOME}/Qt/6.*/macos/)
PATH="${QT_BASEPATH}/bin/:${PATH}"
export PATH export PATH
CMAKE_PREFIX_PATH="${HOME}/Qt/6.5.1/macos/lib/cmake" CMAKE_PREFIX_PATH="${QT_BASEPATH}/lib/cmake"
export CMAKE_PREFIX_PATH export CMAKE_PREFIX_PATH
cmake -GNinja -S. -Bbuild \ cmake -GNinja -S. -Bbuild \
@ -19,7 +20,7 @@ cmake -GNinja -S. -Bbuild \
-DHUNTER_ENABLED=ON -DBUILD_SHARED_LIBS=OFF \ -DHUNTER_ENABLED=ON -DBUILD_SHARED_LIBS=OFF \
-DCMAKE_BUILD_TYPE=RelWithDebInfo -DHUNTER_CONFIGURATION_TYPES=RelWithDebInfo \ -DCMAKE_BUILD_TYPE=RelWithDebInfo -DHUNTER_CONFIGURATION_TYPES=RelWithDebInfo \
-DUSE_BUNDLED_OPENSSL=ON \ -DUSE_BUNDLED_OPENSSL=ON \
-DQt6_DIR=${HOME}/Qt/6.5.1/macos/lib/cmake \ -DQt6_DIR=${QT_BASEPATH}/lib/cmake \
-DCI_BUILD=ON -DCI_BUILD=ON
cmake --build build cmake --build build
cmake --install build cmake --install build

6
.ci/macos/notarize.sh
View file

@ -1,4 +1,4 @@
#!/bin/sh #!/bin/bash
set -u set -u
@ -6,8 +6,8 @@ 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="${HOME}/Qt/6.5.1/macos/bin/:${PATH}" export QTPATH=(${PATH}/Qt/6.*/macos/bin)
export PATH export PATH=${QTPATH}:${PATH}
security unlock-keychain -p "${RUNNER_USER_PW}" login.keychain security unlock-keychain -p "${RUNNER_USER_PW}" login.keychain

5
.cirrus.yml
View file

@ -12,9 +12,10 @@ task:
aqt_script: aqt_script:
- pip3 install aqtinstall - pip3 install aqtinstall
- mkdir $HOME/Qt - mkdir $HOME/Qt
- aqt install-qt --outputdir $HOME/qt mac desktop 6.5.1 clang_64 -m all - aqt install-qt --outputdir $HOME/qt mac desktop 6 clang_64 -m all
build_script: build_script:
- export PATH="${HOME}/Qt/6.5.1/macos/bin:${PATH}" - export QTPATH=($HOME/qt/6.*/macos/bin)
- export PATH="$QTPATH:${PATH}"
- ./.ci/macos/build.sh - ./.ci/macos/build.sh
zip_script: zip_script:
- ditto -c -k --sequesterRsrc --keepParent nheko.app nheko.zip - ditto -c -k --sequesterRsrc --keepParent nheko.app nheko.zip

3
.gitlab-ci.yml
View file

@ -173,7 +173,8 @@ codesign-macos:
before_script: before_script:
- pip3 install dmgbuild - pip3 install dmgbuild
script: script:
- export PATH=/Users/jdonof/Qt/6.5.1/macos/bin:${PATH} - export QTPATH=(/Users/jdonof/Qt/6.*/macos/bin)
- export PATH=${QTPATH}:${PATH}
- ./.ci/macos/notarize.sh - ./.ci/macos/notarize.sh
after_script: after_script:
- ./.ci/upload-nightly-gitlab.sh artifacts/nheko-${CI_COMMIT_SHORT_SHA}-${PLAT}.dmg - ./.ci/upload-nightly-gitlab.sh artifacts/nheko-${CI_COMMIT_SHORT_SHA}-${PLAT}.dmg