From f91287a369c030408ad3a69ac4338c1a6133e8de Mon Sep 17 00:00:00 2001
From: Christoph Settgast <csett86@web.de>
Date: Wed, 5 Jan 2022 11:26:45 +0100
Subject: [PATCH] ci(mac): directly set env vars based on secrets (#697)

Then they are only set to something meaningful if they are present,
so same logic as before, just a bit cleaner and better working for downstream
forks which dont need mac signed builds.
---
 .github/workflows/ci.yml | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d2135d3..5d49b39 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -40,17 +40,14 @@ jobs:
     - uses: actions/setup-node@v2
       with:
         node-version: '16'
-    - name: Prepare for app signing and notarization
-      if: ${{ github.event_name != 'pull_request' }}
-      run: |
-        echo "CSC_LINK=${{ secrets.mac_cert }}" >> $GITHUB_ENV
-        echo "CSC_KEY_PASSWORD=${{ secrets.mac_cert_password }}" >> $GITHUB_ENV
-        echo "APPLE_ID=${{ secrets.apple_id }}" >> $GITHUB_ENV
-        echo "APPLE_ID_PASSWORD=${{ secrets.apple_id_password }}" >> $GITHUB_ENV
-        echo "TEAM_ID=${{ secrets.team_id }}" >> $GITHUB_ENV
     - name: Build it
       env:
         GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        CSC_LINK: ${{ secrets.mac_cert }}
+        CSC_KEY_PASSWORD: ${{ secrets.mac_cert_password }}
+        APPLE_ID: ${{ secrets.apple_id }}
+        APPLE_ID_PASSWORD: ${{ secrets.apple_id_password }}
+        TEAM_ID: ${{ secrets.team_id }}
       run: |
         npm install
         npm run lint