5 files changed, 10 insertions, 12 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
diff --git a/.cirrus.yml b/.cirrus.yml
index 11de4d1a..8618b7ee 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -13,9 +13,9 @@ task:
- export PATH="$(brew --prefix qt5)/bin/:${PATH}"
- ./.ci/macos/build.sh
zip_script:
- - ditto -c -k --sequesterRsrc --keepParent build/nheko.app build/nheko.zip
+ - ditto -c -k --sequesterRsrc --keepParent nheko.app nheko.zip
gitlab_script:
- >
[ "${CIRRUS_BRANCH}" == "master" ] && curl -X POST --fail -F token="${GITLAB_TRIGGER_TOKEN}" -F ref="${CIRRUS_BRANCH}" -F "variables[TRIGGER_BUILD_ID]=${CIRRUS_BUILD_ID}" -F "variables[TRIGGERED_BY]=cirrus" "https://nheko.im/api/v4/projects/2/trigger/pipeline" || true
binaries_artifacts:
- path: build/nheko.zip
+ path: nheko.zip
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 27e0807b..4dd926d6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -155,7 +155,7 @@ build-macos:
- if : '$CI_PIPELINE_TRIGGERED == null'
artifacts:
paths:
- - build/nheko.app # not putting this in 'artifacts' subdir because we don't want to put it on releases
+ - nheko.app # not putting this in 'artifacts' subdir because we don't want to put it on releases
name: nheko-${CI_COMMIT_SHORT_SHA}-macos-app
expose_as: 'macos-app'
public: false
|
