From 55efe19c0b30abaa4ff0e3af661508cb1868dd65 Mon Sep 17 00:00:00 2001
From: aboyko <aboyko@vmware.com>
Date: Wed, 19 Jul 2023 19:22:20 -0400
Subject: [PATCH] GHA: debug osx dmg signing

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

diff --git a/.github/scripts/sign-notarize-osx-distro-file.sh b/.github/scripts/sign-notarize-osx-distro-file.sh
index 6d1b93294..48095d2e4 100755
--- a/.github/scripts/sign-notarize-osx-distro-file.sh
+++ b/.github/scripts/sign-notarize-osx-distro-file.sh
@@ -37,14 +37,17 @@ cat ./dmg-config.json
 dmg_filename=${filename%.*.*}.dmg
 appdmg ./dmg-config.json ../${dmg_filename}
 cd ..
+pwd
+ls
 rm -rf ./${destination_folder_name}
 rm -f $filename
 
-echo "Sign $dmg_filename"
-codesign --verbose --deep --force --timestamp --keychain $KEYCHAIN -s "${MACOS_CERTIFICATE_ID}" $dmg_filename
+echo "Sign ${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"
-(xcrun notarytool submit ${dmg_filename} --keychain-profile notarize-app-dmg-profile --wait \
+(xcrun notarytool submit ./${dmg_filename} --keychain-profile notarize-app-dmg-profile --wait \
 && echo "Staple and generate checksums for ${dmg_filename}" \
 && xcrun stapler staple $dmg_filename \
 && shasum -a 256 $dmg_filename > ${dmg_filename}.sha256 \
diff --git a/.github/workflows/gh-hosted-eclipse-distro-build.yml b/.github/workflows/gh-hosted-eclipse-distro-build.yml
index 2f65a66f9..80f09922f 100644
--- a/.github/workflows/gh-hosted-eclipse-distro-build.yml
+++ b/.github/workflows/gh-hosted-eclipse-distro-build.yml
@@ -173,7 +173,7 @@ jobs:
       - name: Setup Notarization Credentials
         run: |
           xcrun notarytool store-credentials notarize-app-dmg-profile --apple-id ${{ secrets.AC_USERNAME }} --team-id ${{ secrets.APPLE_TEAM_ID }} --password ${{ secrets.AC_PASSWORD }}
-      - name: Download OSX tarr.gz files from S3 for Signing/Notarization
+      - name: Download OSX tar.gz files from S3 for Signing/Notarization
         env:
           AWS_ACCESS_KEY_ID: ${{ secrets.TOOLS_S3_ACCESS_KEY }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.TOOLS_S3_SECRET_KEY  }}