From ca6d6acad84779a03fb1a2d736146aa90c2fbf0d Mon Sep 17 00:00:00 2001
From: Julio Lopez <1953782+julio-lopez@users.noreply.github.com>
Date: Fri, 21 Jul 2023 11:33:40 -0700
Subject: [PATCH] fix(ci): avoid hung CI jobs while notarizing the kopia app on
 MacOS  (#3168)

Avoid hanging while notarizing the UI on MacOS for PRs in the same repo.

Unset various variables, including KOPIA_UI_NOTARIZE,  when
FORCE_KOPIA_UI_SIGN is not specified
---
 app/Makefile | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/app/Makefile b/app/Makefile
index a0b5b130d..569c12eb6 100644
--- a/app/Makefile
+++ b/app/Makefile
@@ -25,11 +25,20 @@ endif
 
 else
 
-# not running on Travis, or Travis in PR mode, don't build installer and don't publish
+# Running as part of a pull_request event on GH, or outside a GH workflow, then
+# don't build installer and don't publish
 ifneq ($(FORCE_KOPIA_UI_SIGN),)
 electron_builder_flags+=--dir
-endif
 
+else
+
+# unset CSC_LINK completely, otherwise electron builder hangs attempting to
+# notarize.
+unexport CSC_LINK
+unexport CSC_KEY_PASSWORD
+unexport KOPIA_UI_NOTARIZE
+
+endif
 endif
 
 # empty CSC_LINK, unset completely since empty value confuses electron builder.