From 2f966ce4de8185121126bff945737629b42d1329 Mon Sep 17 00:00:00 2001
From: Kaalleen <36401965+kaalleen@users.noreply.github.com>
Date: Sun, 15 Oct 2023 07:08:36 +0200
Subject: Update shapely (#2471)

* update shapely
* pin pyinstaller to 5.13.2 (issues with macOS) (rejbasket)
* macOS: do not install shapely from binary, but remove .dylibs folder (breaks notarizazion) (rejbasket)
---
 bin/build-distribution-archives | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

(limited to 'bin/build-distribution-archives')

diff --git a/bin/build-distribution-archives b/bin/build-distribution-archives
index b44cad46..021461df 100644
--- a/bin/build-distribution-archives
+++ b/bin/build-distribution-archives
@@ -8,6 +8,8 @@ if [ "$BUILD" = "osx" ]; then
     # adding version to Info.plist
     plutil -replace CFBundleShortVersionString -string ${VERSION} dist/inkstitch.app/Contents/Info.plist
     rm -rf dist/inkstitch/
+    # this removes the extra dylibs that cause notary to fail.
+    rm -rf dist/inkstitch.app/Contents/MacOS/shapely/.dylibs
     # Install location for pkgbuild
     PKG_INSTALL_PATH="/tmp/inkstitch/"
     # Checking arch of macos and setting path of electron for arm64 or intel
@@ -70,11 +72,23 @@ if [ "$BUILD" = "osx" ]; then
                                                 --team-id '929A568N58' \
                                                 --password "${NOTARY_PASSWORD}"
             echo "Invoking notary process"
-            xcrun notarytool submit --wait \
+            xcrun notarytool submit -f json --wait \
                                     --keychain-profile "inkstitch-profile" \
-                                    artifacts/inkstitch-${VERSION}-${OS}.pkg
+                                    artifacts/inkstitch-${VERSION}-${OS}.pkg 2>&1 | tee /tmp/notarization_info.json
             echo "Stapling the pkg for release"
             xcrun stapler staple artifacts/inkstitch-${VERSION}-${OS}.pkg
+            echo "Fetching the Notary Log"
+            # code snippet is from https://github.com/ddev/signing_tools/blob/master/macos_notarize.sh
+            status=$(jq -r .status </tmp/notarization_info.json)
+            id=$(jq -r .id </tmp/notarization_info.json)
+            echo "status=${status} id=${id}"
+            xcrun notarytool log --apple-id "${NOTARY_ACCOUNT}" --team-id '929A568N58'  --password "${NOTARY_PASSWORD}" ${id} -f json >/tmp/notarization_log.json
+            issues=$(jq -r .issues </tmp/notarization_log.json)
+            if [ "$issues" != "null" ]; then
+                printf "There are issues with the notarization (${issues})\n"
+                printf "=== Log output === \n$(cat /tmp/notarization_log.json)\n"
+                exit 7;
+            fi;
         fi
     else
         # local builds will not be signed or notarized
-- 
cgit v1.2.3