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

Move nheko buildir up by one

Browse source
This commit is contained in:
Nicolas Werner 2023-06-19 03:12:50 +02:00
parent d6ab75250f
commit 3e34f9de61
No known key found for this signature in database
GPG key ID: C8D75E610773F2D9
5 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.ci/macos/build.sh
View file

@ -21,15 +21,15 @@ cmake -GNinja -S. -Bbuild \
-DUSE_BUNDLED_OPENSSL=ON \ -DUSE_BUNDLED_OPENSSL=ON \
-DCI_BUILD=ON -DCI_BUILD=ON
cmake --build build cmake --build build
cmake --install build
( cd build ( cd build
git clone https://github.com/Nheko-Reborn/qt-jdenticon.git git clone https://github.com/Nheko-Reborn/qt-jdenticon.git
( cd qt-jdenticon ( cd qt-jdenticon
qmake qmake
make -j 4 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/ # "$(brew --prefix qt6)/bin/macdeployqt" nheko.app -always-overwrite -qmldir=../resources/qml/
# # workaround for https://bugreports.qt.io/browse/QTBUG-100686 # # workaround for https://bugreports.qt.io/browse/QTBUG-100686
# cp "$(brew --prefix brotli)/lib/libbrotlicommon.1.dylib" nheko.app/Contents/Frameworks/libbrotlicommon.1.dylib # cp "$(brew --prefix brotli)/lib/libbrotlicommon.1.dylib" nheko.app/Contents/Frameworks/libbrotlicommon.1.dylib
cmake --install .
) )

8
.ci/macos/notarize.sh
View file

@ -20,25 +20,23 @@ if [ -n "${CI_PIPELINE_TRIGGERED:-}" ] && [ "${TRIGGERED_BY:-}" = "cirrus" ]; th
unzip binaries.zip unzip binaries.zip
# we zip 'build/nheko.app' in cirrus ci, cirrus itself puts it in a 'build' directory # 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. # so move it to the right place for the rest of the process.
( cd build || exit
unzip nheko.zip unzip nheko.zip
)
fi fi
if [ ! -d "build/nheko.app" ]; then if [ ! -d "nheko.app" ]; then
echo "nheko.app is missing, you did something wrong!" echo "nheko.app is missing, you did something wrong!"
exit 1 exit 1
fi fi
echo "[INFO] Signing app contents" 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 if [ -f "$fname" ]; then
echo "[INFO] Signing $fname" echo "[INFO] Signing $fname"
codesign --force --timestamp --options=runtime --sign "${APPLE_DEV_IDENTITY}" "$fname" codesign --force --timestamp --options=runtime --sign "${APPLE_DEV_IDENTITY}" "$fname"
fi fi
done 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_SUBMIT_LOG=$(mktemp /tmp/notarize-submit.XXXXXX)
NOTARIZE_STATUS_LOG=$(mktemp /tmp/notarize-status.XXXXXX) NOTARIZE_STATUS_LOG=$(mktemp /tmp/notarize-status.XXXXXX)

2
.ci/macos/settings.json
View file

@ -3,7 +3,7 @@
"compression-level": 9, "compression-level": 9,
"contents": [ "contents": [
{ {
"path": "./build/Nheko.app", "path": "./Nheko.app",
"type": "file", "type": "file",
"x": 140, "x": 140,
"y": 120 "y": 120

4
.cirrus.yml
View file

@ -13,9 +13,9 @@ task:
- export PATH="$(brew --prefix qt5)/bin/:${PATH}" - export PATH="$(brew --prefix qt5)/bin/:${PATH}"
- ./.ci/macos/build.sh - ./.ci/macos/build.sh
zip_script: zip_script:
- ditto -c -k --sequesterRsrc --keepParent build/nheko.app build/nheko.zip - ditto -c -k --sequesterRsrc --keepParent nheko.app nheko.zip
gitlab_script: 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 [ "${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: binaries_artifacts:
path: build/nheko.zip path: nheko.zip

2
.gitlab-ci.yml
View file

@ -155,7 +155,7 @@ build-macos:
- if : '$CI_PIPELINE_TRIGGERED == null' - if : '$CI_PIPELINE_TRIGGERED == null'
artifacts: artifacts:
paths: 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 name: nheko-${CI_COMMIT_SHORT_SHA}-macos-app
expose_as: 'macos-app' expose_as: 'macos-app'
public: false public: false