From f730982e7b18ad73f9b7f33d9bcfcecadebef3e8 Mon Sep 17 00:00:00 2001 From: Conrad Irwin Date: Mon, 6 Nov 2023 09:38:09 -0700 Subject: [PATCH 1/2] Use notarytool to bundle --- script/bundle | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/script/bundle b/script/bundle index 69a2f165dc..c3c5bd76ab 100755 --- a/script/bundle +++ b/script/bundle @@ -228,8 +228,7 @@ else if [[ -n $MACOS_CERTIFICATE && -n $MACOS_CERTIFICATE_PASSWORD && -n $APPLE_NOTARIZATION_USERNAME && -n $APPLE_NOTARIZATION_PASSWORD ]]; then echo "Notarizing DMG with Apple" - npm install -g notarize-cli - npx notarize-cli --file "${dmg_file_path}" --bundle-id dev.zed.Zed --username "$APPLE_NOTARIZATION_USERNAME" --password "$APPLE_NOTARIZATION_PASSWORD" + "$(xcode-select -p)/usr/bin/notarytool" submit --wait --apple-id "$APPLE_NOTARIZATION_USERNAME" --password "$APPLE_NOTARIZATION_PASSWORD" --team-id MQ55VZLNZQ "${dmg_file_path}" fi if [ "$open_result" = true ]; then From 4d88a326e102a7123a258d8c4de927b88f12b994 Mon Sep 17 00:00:00 2001 From: Conrad Irwin Date: Mon, 6 Nov 2023 10:37:35 -0700 Subject: [PATCH 2/2] Tidy up a bit better --- script/bundle | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/script/bundle b/script/bundle index c3c5bd76ab..b8e64b53ce 100755 --- a/script/bundle +++ b/script/bundle @@ -10,6 +10,9 @@ local_only=false overwrite_local_app=false bundle_name="" +# This must match the team in the provsiioning profile. +APPLE_NOTORIZATION_TEAM="MQ55VZLNZQ" + # Function for displaying help info help_info() { echo " @@ -228,7 +231,7 @@ else if [[ -n $MACOS_CERTIFICATE && -n $MACOS_CERTIFICATE_PASSWORD && -n $APPLE_NOTARIZATION_USERNAME && -n $APPLE_NOTARIZATION_PASSWORD ]]; then echo "Notarizing DMG with Apple" - "$(xcode-select -p)/usr/bin/notarytool" submit --wait --apple-id "$APPLE_NOTARIZATION_USERNAME" --password "$APPLE_NOTARIZATION_PASSWORD" --team-id MQ55VZLNZQ "${dmg_file_path}" + "$(xcode-select -p)/usr/bin/notarytool" submit --wait --apple-id "$APPLE_NOTARIZATION_USERNAME" --password "$APPLE_NOTARIZATION_PASSWORD" --team-id "$APPLE_NOTORIZATION_TEAM" "${dmg_file_path}" fi if [ "$open_result" = true ]; then