From 644b2e24ac2bd06583f940f0e06907d3107e2174 Mon Sep 17 00:00:00 2001
From: aboyko <aboyko@vmware.com>
Date: Wed, 19 Jul 2023 19:52:50 -0400
Subject: [PATCH] GHA: try correcting KEYCHAIN variable value

---
 .github/scripts/sign-notarize-osx-distro-file.sh     | 2 +-
 .github/workflows/gh-hosted-eclipse-distro-build.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/scripts/sign-notarize-osx-distro-file.sh b/.github/scripts/sign-notarize-osx-distro-file.sh
index 48095d2e4..7d20f0f6f 100755
--- a/.github/scripts/sign-notarize-osx-distro-file.sh
+++ b/.github/scripts/sign-notarize-osx-distro-file.sh
@@ -43,7 +43,7 @@ rm -rf ./${destination_folder_name}
 rm -f $filename
 
 echo "Sign ${dmg_filename}"
-echo 'codesign --verbose --deep --force --timestamp --keychain "${KEYCHAIN}" -s "${MACOS_CERTIFICATE_ID}" ./$dmg_filename'
+echo 'codesign --verbose --deep --force --timestamp --keychain "'${KEYCHAIN}'" -s "'${MACOS_CERTIFICATE_ID}'" ./$dmg_filename'
 codesign --verbose --deep --force --timestamp --keychain "${KEYCHAIN}" -s "${MACOS_CERTIFICATE_ID}" ./$dmg_filename
 
 echo "Notarizing $dmg_filename"
diff --git a/.github/workflows/gh-hosted-eclipse-distro-build.yml b/.github/workflows/gh-hosted-eclipse-distro-build.yml
index 4332abc99..01f94a9f9 100644
--- a/.github/workflows/gh-hosted-eclipse-distro-build.yml
+++ b/.github/workflows/gh-hosted-eclipse-distro-build.yml
@@ -185,7 +185,7 @@ jobs:
         env:
           MACOS_CERTIFICATE_ID: ${{ secrets.MACOS_CERTIFICATE_ID }}
         run: |
-          KEYCHAIN=$RUNNER_TEMP/app-signing.keychain-db
+          export KEYCHAIN=$RUNNER_TEMP/app-signing.keychain-db
           ls ${{ github.workspace }}/.github/assets
           files=`ls spring-tool-suite-4*macosx*.tar.gz`
           for file in $files