From 44ad05129a4a40cef6d62684a6ef41f40f2dab19 Mon Sep 17 00:00:00 2001
From: Caelan Sayler <git@caesay.com>
Date: Sat, 14 May 2022 13:08:01 +0100
Subject: [PATCH] Try gon for notarization

---
 .github/workflows/build.yml | 24 ++++++++++++++++++++----
 Squirrel.sln                |  1 +
 gon.config.json             | 22 ++++++++++++++++++++++
 3 files changed, 43 insertions(+), 4 deletions(-)
 create mode 100644 gon.config.json

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a4f6fe81..0e9a0e93 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -85,10 +85,26 @@ jobs:
           # import certificate to keychain
           security import $CERTIFICATE_PATH -P "$P12_PASSWORD" -A -t cert -f pkcs12 -k $KEYCHAIN_PATH
           security list-keychain -d user -s $KEYCHAIN_PATH
-      - name: CodeSign Binaries
-        run: |
-          codesign --force --timestamp --options=runtime --keychain $KEYCHAIN_PATH --entitlements Squirrel.entitlements --sign "Developer ID Application: Caelan Sayler" ./publish/SquirrelMac
-          codesign --force --timestamp --options=runtime --keychain $KEYCHAIN_PATH --entitlements Squirrel.entitlements --sign "Developer ID Application: Caelan Sayler" ./publish/UpdateMac
+#      - name: CodeSign Binaries
+#        run: |
+#          codesign --force --timestamp --options=runtime --keychain $KEYCHAIN_PATH --entitlements ./Squirrel.entitlements --sign "Developer ID Application: Caelan Sayler" ./publish/SquirrelMac
+#          codesign --force --timestamp --options=runtime --keychain $KEYCHAIN_PATH --entitlements ./Squirrel.entitlements --sign "Developer ID Application: Caelan Sayler" ./publish/UpdateMac
+#          zip bundle.zip ./publish/SquirrelMac
+#          zip bundle.zip ./publish/UpdateMac
+      - name: Install mitchellh/gon
+        run: brew install mitchellh/gon/gon
+      - name: Bundle, Sign, and Notarize
+        run: gon ./gon.config.json
+#      - name: Notarize Binaries
+#        uses: devbotsxyz/xcode-notarize@v1
+#        with:
+#          product-path: "bundle.zip"
+#          appstore-connect-username: ${{ secrets.NOTARIZATION_USERNAME }}
+#          appstore-connect-password: ${{ secrets.NOTARIZATION_PASSWORD }}
+#      - name: Staple Notarization
+#        uses: devbotsxyz/xcode-staple@v1
+#        with:
+#          product-path: "bundle.zip"
       - name: Clean up KeyChain
         if: ${{ always() }}
         run: |
diff --git a/Squirrel.sln b/Squirrel.sln
index 0be17c64..5414e433 100644
--- a/Squirrel.sln
+++ b/Squirrel.sln
@@ -20,6 +20,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SolutionLevel", "SolutionLe
 		build.ps1 = build.ps1
 		pack.ps1 = pack.ps1
 		Squirrel.entitlements = Squirrel.entitlements
+		gon.config.json = gon.config.json
 	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Squirrel.CommandLine.Windows", "src\Squirrel.CommandLine.Windows\Squirrel.CommandLine.Windows.csproj", "{19E8EBF5-0277-422F-BF49-C66D9DBA5AA4}"
diff --git a/gon.config.json b/gon.config.json
new file mode 100644
index 00000000..db0d91e3
--- /dev/null
+++ b/gon.config.json
@@ -0,0 +1,22 @@
+{
+  "source": [
+    "./publish/SquirrelMac",
+    "./publish/UpdateMac"
+  ],
+  "bundle_id": "com.caesay.squirrel",
+  "apple_id": {
+    "username": "@env:NZ_USERNAME",
+    "password": "@env:NZ_PASSWORD"
+  },
+  "sign": {
+    "application_identity": "Developer ID Application: Caelan Sayler",
+    "entitlements_file": "Squirrel.entitlements"
+  },
+  "dmg": {
+    "output_path": "Squirrel.dmg",
+    "volume_name": "Squirrel"
+  },
+  "zip": {
+    "output_path": "Squirrel.zip"
+  }
+}
\ No newline at end of file