From 5532413bdbfe7f206d802392acf50066ff8ab184 Mon Sep 17 00:00:00 2001
From: Hayden Esser <esserhr@ornl.gov>
Date: Mon, 14 Oct 2024 14:26:14 -0400
Subject: [PATCH 1/2] Updated workflows/electron.yml - fixed jsign formatting
 during windows packaging and signing

---
 .github/workflows/electron.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/electron.yml b/.github/workflows/electron.yml
index 7a0ceeedcf..18c45c69b5 100644
--- a/.github/workflows/electron.yml
+++ b/.github/workflows/electron.yml
@@ -51,7 +51,7 @@ jobs:
             java -jar ~/jsign.jar \
               --storetype "${{ secrets.WIN_STORE_TYPE }}" \
               --storepass "${{ secrets.WIN_STORE_SECRET }}" \
-              --tsaurl "http://timestamp.sectigo.com"
+              --tsaurl "http://timestamp.sectigo.com" \
               --certfile ./wincert.pem \
               $EXE_PATH &&
             (OLD_HASH=$(ggrep -o -P -m 1 '(?<=sha512:\s).*' ../output/latest.yml) &

From f7ca55cbf6e0e4bbfec68cacb307e721622103fd Mon Sep 17 00:00:00 2001
From: Hayden Esser <esserhr@ornl.gov>
Date: Mon, 14 Oct 2024 14:39:36 -0400
Subject: [PATCH 2/2] Updated workflows/electron.yml - relocated notarization
 submission to notarize step, added additional sleep prior to attempting to
 staple dmg after notarization submission

---
 .github/workflows/electron.yml | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/electron.yml b/.github/workflows/electron.yml
index 18c45c69b5..9d6196489d 100644
--- a/.github/workflows/electron.yml
+++ b/.github/workflows/electron.yml
@@ -40,12 +40,7 @@ jobs:
         run: npm run build-prod-desktop-ci
       - name: Package
         run: |
-          (node ./node_modules/.bin/electron-builder --mac --universal --publish never &&
-            xcrun notarytool submit --wait \
-              --apple-id "${{ secrets.APPLE_ID }}" \
-              --password "${{ secrets.APPLE_APP_SECRET }}" \
-              --team-id "${{ secrets.APPLE_TEAM_ID }}" \
-              $(find ../output -name "MEASUR-*.*.*.dmg")) &
+          node ./node_modules/.bin/electron-builder --mac --universal --publish never &
           (node ./node_modules/.bin/electron-builder --win --x64 --publish never &&
             EXE_PATH=$(find ../output -name "MEASUR-Setup-*.*.*.exe") &&
             java -jar ~/jsign.jar \
@@ -100,7 +95,10 @@ jobs:
         with:
           name: init-mac-output
       - name: Notarize
-        run: xcrun stapler staple $(find ./ -name "MEASUR-*.*.*.dmg")
+        run: |
+          xcrun notarytool submit --wait --apple-id "${{ secrets.APPLE_ID }}" --password "${{ secrets.APPLE_APP_SECRET }}" --team-id "${{ secrets.APPLE_TEAM_ID }}" $(find ./ -name "MEASUR-*.*.*.dmg") &&
+          sleep 60 &&
+          xcrun stapler staple $(find ./ -name "MEASUR-*.*.*.dmg")
       - name: Upload notarized artifact
         uses: actions/upload-artifact@v4
         with: