From 0049df4b9d4e76c39362202ee66108a24bfa68ed Mon Sep 17 00:00:00 2001
From: Vijay A <vraravam@users.noreply.github.com>
Date: Tue, 19 Apr 2022 23:25:42 -0500
Subject: Simplify skipping notarization of the mac dmg based on the same env
 var: 'CSC_IDENTITY_AUTO_DISCOVERY' (used for signing)

---
 .github/workflows/builds.yml | 3 ---
 build-helpers/notarize.js    | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml
index 1a93ab19a..5e94b6b9e 100644
--- a/.github/workflows/builds.yml
+++ b/.github/workflows/builds.yml
@@ -105,7 +105,6 @@ jobs:
           echo "ELECTRON_CACHE=$HOME/.cache/electron" >> $GITHUB_ENV
           echo "ELECTRON_BUILDER_CACHE=$HOME/.cache/electron-builder" >> $GITHUB_ENV
           echo "MANUAL_REBUILD_ON_NIGHTLY=${{ github.event_name == 'workflow_dispatch' && contains(github.event.inputs.message, '[nightly branch]') }}" >> $GITHUB_ENV
-          echo "SKIP_NOTARIZATION=${{ !contains(github.repository_owner, 'ferdium') }}" >> $GITHUB_ENV
       - name: Checkout code along with submodules for the 'nightly' branch if the trigger event is 'scheduled' or this is a forced rebuild on the nightly branch
         uses: actions/checkout@v2
         if: ${{ github.event_name == 'schedule' || env.MANUAL_REBUILD_ON_NIGHTLY == 'true' }}
@@ -193,7 +192,6 @@ jobs:
           echo "ELECTRON_CACHE=$HOME/.cache/electron" >> $GITHUB_ENV
           echo "ELECTRON_BUILDER_CACHE=$HOME/.cache/electron-builder" >> $GITHUB_ENV
           echo "MANUAL_REBUILD_ON_NIGHTLY=${{ github.event_name == 'workflow_dispatch' && contains(github.event.inputs.message, '[nightly branch]') }}" >> $GITHUB_ENV
-          echo "SKIP_NOTARIZATION=${{ !contains(github.repository_owner, 'ferdium') }}" >> $GITHUB_ENV
       - name: Checkout code along with submodules for the 'nightly' branch if the trigger event is 'scheduled' or this is a forced rebuild on the nightly branch
         uses: actions/checkout@v2
         if: ${{ github.event_name == 'schedule' || env.MANUAL_REBUILD_ON_NIGHTLY == 'true' }}
@@ -294,7 +292,6 @@ jobs:
         run: |
           echo "HOME=$USERPROFILE" >> $GITHUB_ENV
           echo "MANUAL_REBUILD_ON_NIGHTLY=${{ github.event_name == 'workflow_dispatch' && contains(github.event.inputs.message, '[nightly branch]') }}" >> $GITHUB_ENV
-          echo "SKIP_NOTARIZATION=${{ !contains(github.repository_owner, 'ferdium') }}" >> $GITHUB_ENV
         shell: bash
       - name: Checkout code along with submodules for the 'nightly' branch if the trigger event is 'scheduled' or this is a forced rebuild on the nightly branch
         uses: actions/checkout@v2
diff --git a/build-helpers/notarize.js b/build-helpers/notarize.js
index eaef75e19..bbd81c7b6 100644
--- a/build-helpers/notarize.js
+++ b/build-helpers/notarize.js
@@ -1,6 +1,6 @@
 exports.default = async function notarizing(context) {
   const { electronPlatformName, appOutDir } = context;
-  if (electronPlatformName !== 'darwin' || process.env.SKIP_NOTARIZATION === 'true' || (process.env.GIT_BRANCH_NAME !== 'release' && process.env.GIT_BRANCH_NAME !== 'nightly')) {
+  if (electronPlatformName !== 'darwin' || process.env.CSC_IDENTITY_AUTO_DISCOVERY === 'false' || (process.env.GIT_BRANCH_NAME !== 'release' && process.env.GIT_BRANCH_NAME !== 'nightly')) {
     return;
   }
 
-- 
cgit v1.2.3-70-g09d2