diff options
| author | Nicolas Werner <nicolas.werner@hotmail.de> | 2023-11-06 20:49:54 +0100 |
|---|---|---|
| committer | Nicolas Werner <nicolas.werner@hotmail.de> | 2023-11-06 20:49:54 +0100 |
| commit | 31aebb33ae95557b1b8c0e746d7bb7c7e1ed0592 (patch) | |
| tree | a259613fe8039f8a0e3153407fced9886a9e6388 | |
| parent | Fix crash during calls (diff) | |
| download | nheko-31aebb33ae95557b1b8c0e746d7bb7c7e1ed0592.tar.xz | |
Fix macos builds with newer icu
| -rwxr-xr-x | .ci/macos/build.sh | 9 | ||||
| -rwxr-xr-x | .ci/macos/notarize.sh | 6 | ||||
| -rw-r--r-- | .cirrus.yml | 5 | ||||
| -rw-r--r-- | .gitlab-ci.yml | 3 |
4 files changed, 13 insertions, 10 deletions
diff --git a/.ci/macos/build.sh b/.ci/macos/build.sh index efc183e8..e4978231 100755 --- a/.ci/macos/build.sh +++ b/.ci/macos/build.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env sh +#!/usr/bin/env bash set -ue @@ -6,10 +6,11 @@ set -ue #TAG=$(git tag -l --points-at HEAD) # 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 -CMAKE_PREFIX_PATH="${HOME}/Qt/6.5.1/macos/lib/cmake" +CMAKE_PREFIX_PATH="${QT_BASEPATH}/lib/cmake" export CMAKE_PREFIX_PATH cmake -GNinja -S. -Bbuild \ @@ -19,7 +20,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=${HOME}/Qt/6.5.1/macos/lib/cmake \ + -DQt6_DIR=${QT_BASEPATH}/lib/cmake \ -DCI_BUILD=ON cmake --build build cmake --install build diff --git a/.ci/macos/notarize.sh b/.ci/macos/notarize.sh index b5c83201..b0c05154 100755 --- a/.ci/macos/notarize.sh +++ b/.ci/macos/notarize.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash set -u @@ -6,8 +6,8 @@ set -u # https://forum.qt.io/topic/96652/how-to-notarize-qt-application-on-macos/18 # Add Qt binaries to path -PATH="${HOME}/Qt/6.5.1/macos/bin/:${PATH}" -export PATH +export QTPATH=(${PATH}/Qt/6.*/macos/bin) +export PATH=${QTPATH}:${PATH} security unlock-keychain -p "${RUNNER_USER_PW}" login.keychain diff --git a/.cirrus.yml b/.cirrus.yml index 7cf42910..a29502fd 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -12,9 +12,10 @@ task: aqt_script: - pip3 install aqtinstall - 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: - - 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 zip_script: - ditto -c -k --sequesterRsrc --keepParent nheko.app nheko.zip diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0a15fa33..a273b831 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -173,7 +173,8 @@ codesign-macos: before_script: - pip3 install dmgbuild 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 after_script: - ./.ci/upload-nightly-gitlab.sh artifacts/nheko-${CI_COMMIT_SHORT_SHA}-${PLAT}.dmg |