Merge pull request #7065 from ORNL-AMO/hotfix/automate-windows-build-…

…signing

hotfix/automate-windows-build-signing - Resolve jsign syntax during windows build

.github/workflows/electron.yml

@@ -40,18 +40,13 @@ 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 \
               --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) &
@@ -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: