From 7d20a0228ca5af748cd3d24cbfca47b623276dd2 Mon Sep 17 00:00:00 2001
From: Caelan Sayler <git@caesay.com>
Date: Sat, 14 May 2022 13:26:49 +0100
Subject: [PATCH] gon does not support env vars for apple id

---
 .github/workflows/build.yml |  8 ++++----
 gon.config.json             | 10 +++-------
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index f21b04d9..48bd268a 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -95,9 +95,9 @@ jobs:
         run: brew install mitchellh/gon/gon
       - name: Bundle, Sign, and Notarize
         env:
-          NZ_USERNAME: ${{ secrets.NOTARIZATION_USERNAME }}
-          NZ_PASSWORD: ${{ secrets.NOTARIZATION_PASSWORD }}
-        run: gon -log-json -log-level=debug ./gon.config.json
+          AC_USERNAME: ${{ secrets.NOTARIZATION_USERNAME }}
+          AC_PASSWORD: ${{ secrets.NOTARIZATION_PASSWORD }}
+        run: gon -log-level=debug ./gon.config.json
 #      - name: Notarize Binaries
 #        uses: devbotsxyz/xcode-notarize@v1
 #        with:
@@ -116,5 +116,5 @@ jobs:
         uses: actions/upload-artifact@v3
         with:
           name: osx-tools
-          path: ./publish/*
+          path: ./SquirrelTools.*
         
\ No newline at end of file
diff --git a/gon.config.json b/gon.config.json
index db0d91e3..ecdec927 100644
--- a/gon.config.json
+++ b/gon.config.json
@@ -4,19 +4,15 @@
     "./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"
+    "output_path": "SquirrelTools.dmg",
+    "volume_name": "SquirrelTools"
   },
   "zip": {
-    "output_path": "Squirrel.zip"
+    "output_path": "SquirrelTools.zip"
   }
 }
\ No newline at end of file