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

Some minor cleanup

Browse source
This commit is contained in:
Joseph Donofry 2022-10-27 16:21:20 -04:00
parent 1903b597ed
commit a9424e6bcf
No known key found for this signature in database
GPG key ID: E8A1D78EF044B0CB
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
.ci/macos/notarize.sh
View file

@ -11,7 +11,7 @@ export PATH
security unlock-keychain -p "${RUNNER_USER_PW}" login.keychain security unlock-keychain -p "${RUNNER_USER_PW}" login.keychain
if [ "${CI_PIPELINE_TRIGGERED}" ]; then if [ "${CI_PIPELINE_TRIGGERED}" ] && [ "${TRIGGERED_BY}" = "cirrus" ]; then
echo "cirrus build id: ${TRIGGER_BUILD_ID}" echo "cirrus build id: ${TRIGGER_BUILD_ID}"
cat "${TRIGGER_PAYLOAD}" cat "${TRIGGER_PAYLOAD}"
# download the build artifacts from cirrus api # download the build artifacts from cirrus api
@ -39,7 +39,6 @@ find "build/nheko.app/Contents"|while read -r fname; do
done done
codesign --force --timestamp --options=runtime --sign "${APPLE_DEV_IDENTITY}" "build/nheko.app" codesign --force --timestamp --options=runtime --sign "${APPLE_DEV_IDENTITY}" "build/nheko.app"
codesign -vvv --deep --strict "build/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)
@ -51,7 +50,6 @@ trap finish EXIT
dmgbuild -s .ci/macos/settings.json "Nheko" nheko.dmg dmgbuild -s .ci/macos/settings.json "Nheko" nheko.dmg
codesign -s "${APPLE_DEV_IDENTITY}" nheko.dmg codesign -s "${APPLE_DEV_IDENTITY}" nheko.dmg
codesign -vvv --deep --strict nheko.dmg
user=$(id -nu) user=$(id -nu)
chown "${user}" nheko.dmg chown "${user}" nheko.dmg
@ -89,6 +87,7 @@ while sleep 60 && date; do
fi fi
if [ "${sub_status}" = "Invalid" ] || [ "${sub_status}" = "Rejected" ]; then if [ "${sub_status}" = "Invalid" ] || [ "${sub_status}" = "Rejected" ]; then
echo "Notarization failed" echo "Notarization failed"
xcrun notarytool log "${requestUUID}" --apple-id "${APPLE_DEV_USER}" --password "${APPLE_DEV_PASS}" --team-id "${APPLE_TEAM_ID}" > "$NOTARIZE_STATUS_LOG" 2>&1
cat "$NOTARIZE_STATUS_LOG" 1>&2 cat "$NOTARIZE_STATUS_LOG" 1>&2
exit 1 exit 1
fi fi

1
.cirrus.yml
View file

@ -18,6 +18,7 @@ task:
-F token="${GITLAB_TRIGGER_TOKEN}" -F token="${GITLAB_TRIGGER_TOKEN}"
-F ref="${CIRRUS_BRANCH}" -F ref="${CIRRUS_BRANCH}"
-F "variables[TRIGGER_BUILD_ID]=${CIRRUS_BUILD_ID}" -F "variables[TRIGGER_BUILD_ID]=${CIRRUS_BUILD_ID}"
-F "variables[TRIGGERED_BY]=cirrus"
"https://nheko.im/api/v4/projects/2/trigger/pipeline" "https://nheko.im/api/v4/projects/2/trigger/pipeline"
binaries_artifacts: binaries_artifacts:
path: build/nheko.zip path: build/nheko.zip