diff options
| author | Nicolas Werner <nicolas.werner@hotmail.de> | 2023-06-19 03:12:50 +0200 |
|---|---|---|
| committer | Nicolas Werner <nicolas.werner@hotmail.de> | 2023-06-19 03:13:27 +0200 |
| commit | 3e34f9de6176bcac6c8ca479e86a7b35d001b9f7 (patch) | |
| tree | bfa1a34746039bbd65accd76fd8e82386226747a /.ci | |
| parent | Temporarily revert TextArea change until I find a proper fix for the binding ... (diff) | |
| download | nheko-3e34f9de6176bcac6c8ca479e86a7b35d001b9f7.tar.xz | |
Move nheko buildir up by one
Diffstat (limited to '.ci')
| -rwxr-xr-x | .ci/macos/build.sh | 4 | ||||
| -rwxr-xr-x | .ci/macos/notarize.sh | 10 | ||||
| -rw-r--r-- | .ci/macos/settings.json | 2 |
3 files changed, 7 insertions, 9 deletions
diff --git a/.ci/macos/build.sh b/.ci/macos/build.sh index 18340258..cf6a634d 100755 --- a/.ci/macos/build.sh +++ b/.ci/macos/build.sh @@ -21,15 +21,15 @@ cmake -GNinja -S. -Bbuild \ -DUSE_BUNDLED_OPENSSL=ON \ -DCI_BUILD=ON cmake --build build +cmake --install build ( cd build git clone https://github.com/Nheko-Reborn/qt-jdenticon.git ( cd qt-jdenticon qmake make -j 4 - cp libqtjdenticon.dylib ../nheko.app/Contents/MacOS + cp libqtjdenticon.dylib ../../nheko.app/Contents/MacOS ) # "$(brew --prefix qt6)/bin/macdeployqt" nheko.app -always-overwrite -qmldir=../resources/qml/ # # workaround for https://bugreports.qt.io/browse/QTBUG-100686 # cp "$(brew --prefix brotli)/lib/libbrotlicommon.1.dylib" nheko.app/Contents/Frameworks/libbrotlicommon.1.dylib - cmake --install . ) diff --git a/.ci/macos/notarize.sh b/.ci/macos/notarize.sh index 6dc057bc..33a6da50 100755 --- a/.ci/macos/notarize.sh +++ b/.ci/macos/notarize.sh @@ -20,25 +20,23 @@ if [ -n "${CI_PIPELINE_TRIGGERED:-}" ] && [ "${TRIGGERED_BY:-}" = "cirrus" ]; th unzip binaries.zip # we zip 'build/nheko.app' in cirrus ci, cirrus itself puts it in a 'build' directory # so move it to the right place for the rest of the process. - ( cd build || exit - unzip nheko.zip - ) + unzip nheko.zip fi -if [ ! -d "build/nheko.app" ]; then +if [ ! -d "nheko.app" ]; then echo "nheko.app is missing, you did something wrong!" exit 1 fi echo "[INFO] Signing app contents" -find "build/nheko.app/Contents"|while read -r fname; do +find "nheko.app/Contents"|while read -r fname; do if [ -f "$fname" ]; then echo "[INFO] Signing $fname" codesign --force --timestamp --options=runtime --sign "${APPLE_DEV_IDENTITY}" "$fname" fi done -codesign --force --timestamp --options=runtime --sign "${APPLE_DEV_IDENTITY}" "build/nheko.app" +codesign --force --timestamp --options=runtime --sign "${APPLE_DEV_IDENTITY}" "nheko.app" NOTARIZE_SUBMIT_LOG=$(mktemp /tmp/notarize-submit.XXXXXX) NOTARIZE_STATUS_LOG=$(mktemp /tmp/notarize-status.XXXXXX) diff --git a/.ci/macos/settings.json b/.ci/macos/settings.json index d156a3b6..6a133d97 100644 --- a/.ci/macos/settings.json +++ b/.ci/macos/settings.json @@ -3,7 +3,7 @@ "compression-level": 9, "contents": [ { - "path": "./build/Nheko.app", + "path": "./Nheko.app", "type": "file", "x": 140, "y": 120 |