From 16fb814b220b3e199bd022ce34e0da29fcb0d61b Mon Sep 17 00:00:00 2001
From: Chris Marslender <chrismarslender@gmail.com>
Date: Thu, 25 Aug 2022 15:59:58 -0500
Subject: [PATCH] Don't try to sign mac installers when secrets are unavailable
 (#13166)

---
 .github/workflows/build-macos-installers.yml | 4 ++--
 build_scripts/build_macos-2-installer.sh     | 8 ++++++++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build-macos-installers.yml b/.github/workflows/build-macos-installers.yml
index 6f4cd95f71..9bd4dde45d 100644
--- a/.github/workflows/build-macos-installers.yml
+++ b/.github/workflows/build-macos-installers.yml
@@ -159,8 +159,8 @@ jobs:
           NOTARIZE: ${{ steps.check_secrets.outputs.HAS_APPLE_SECRET }}
           APPLE_NOTARIZE_USERNAME: "${{ secrets.APPLE_NOTARIZE_USERNAME }}"
           APPLE_NOTARIZE_PASSWORD: "${{ secrets.APPLE_NOTARIZE_PASSWORD }}"
-          CSC_LINK: "${{ secrets.APPLE_DEV_ID_APP }}"
-          CSC_KEY_PASSWORD: "${{ secrets.APPLE_DEV_ID_APP_PASS }}"
+          APPLE_DEV_ID_APP: "${{ secrets.APPLE_DEV_ID_APP }}"
+          APPLE_DEV_ID_APP_PASS: "${{ secrets.APPLE_DEV_ID_APP_PASS }}"
         run: |
           cd ./build_scripts
           sh build_macos-2-installer.sh
diff --git a/build_scripts/build_macos-2-installer.sh b/build_scripts/build_macos-2-installer.sh
index b68d323e52..3e639ea778 100644
--- a/build_scripts/build_macos-2-installer.sh
+++ b/build_scripts/build_macos-2-installer.sh
@@ -48,6 +48,14 @@ if [ "$(arch)" = "arm64" ]; then
   OPT_ARCH="--arm64"
 fi
 PRODUCT_NAME="Chia"
+if [ "$NOTARIZE" == true ]; then
+	echo "Setting credentials for signing"
+	export CSC_LINK=$APPLE_DEV_ID_APP
+	export CSC_KEY_PASSWORD=$APPLE_DEV_ID_APP_PASS
+else
+	echo "Not on ci or no secrets so not signing"
+	export CSC_IDENTITY_AUTO_DISCOVERY=false
+fi
 echo electron-builder build --mac "${OPT_ARCH}" --config.productName="$PRODUCT_NAME"
 electron-builder build --mac "${OPT_ARCH}" --config.productName="$PRODUCT_NAME"
 LAST_EXIT_CODE=$?