Skip to content
Snippets Groups Projects
Verified Commit a9424e6b authored by Joe Donofry's avatar Joe Donofry
Browse files

Some minor cleanup

parent 1903b597
No related branches found
No related tags found
1 merge request!22Cirrus ci apple silicon
Pipeline #3864 failed
...@@ -11,7 +11,7 @@ export PATH ...@@ -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 ...@@ -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 ...@@ -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 ...@@ -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
......
...@@ -18,6 +18,7 @@ task: ...@@ -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
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment