From c3e3860d5ab7452500651dde1cb32c94f0757d34 Mon Sep 17 00:00:00 2001
From: unknown <p.walt@openbuilds.com>
Date: Fri, 26 Apr 2024 09:47:54 +0200
Subject: [PATCH] v1.0.373

---
 .github/workflows/build.yml | 26 ++++++--------------------
 CHANGELOG.txt               |  3 ++-
 package.json                |  2 +-
 3 files changed, 9 insertions(+), 22 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index df56d0b..f2c0974 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -8,7 +8,6 @@ jobs:
 
     strategy:
       matrix:
-        # os: [macos-latest, windows-latest, ubuntu-20.04]
         os: [macos-latest, windows-latest, ubuntu-latest]
 
     steps:
@@ -63,7 +62,7 @@ jobs:
         shell: cmd
 
       - name: Install setuptools (macos)
-        if: startsWith(matrix.os, 'macos')
+        if: starts+With(matrix.os, 'macos')
         run: sudo -H pip install setuptools
 
       - name: Prepare for app notarization (macos)
@@ -81,30 +80,17 @@ jobs:
           github_token: ${{ secrets.github_token }}
           release: true
           debugElectron: true
+          # Used to Sign before notarizing with Notarize.js
           mac_certs: ${{ secrets.mac_certs }}
           mac_certs_password: ${{ secrets.mac_certs_password }}
         env:
-          # new MacOS notarize secrets (2024)
-          npm_config_verbose: true
-          npm_config_loglevel: verbose
+          #npm_config_verbose: true
+          #npm_config_loglevel: verbose
+          # new MacOS notarize.js secrets (2024)
           DEBUG: electron-builder # To debug electron-builder
           APPLE_ID: ${{ secrets.APPLE_ID }}
           APPLE_APP_SPECIFIC_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }}
           APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
-
+          # Required to authenticate Signing certs
           API_KEY_ID: ${{ secrets.api_key_id }}
           API_KEY_ISSUER_ID: ${{ secrets.api_key_issuer_id }}
-
-      # # new Windows Signing (2024)
-      # - name: Signing using Signtool
-      #   if: startsWith(matrix.os, 'windows')
-      #   run: |
-      #     signtool.exe sign /sha1 ${{ secrets.SM_CODE_SIGNING_CERT_SHA1_HASH }} /tr http://timestamp.digicert.com /td SHA256 /fd SHA256 "D:\a\OpenBuilds-CONTROL\OpenBuilds-CONTROL\dist\*.exe"
-      #     signtool.exe verify /v /pa "D:\a\OpenBuilds-CONTROL\OpenBuilds-CONTROL\dist\*.exe"
-      #
-      # - name: Upload artifacts
-      #   uses: actions/upload-artifact@v2
-      #   with:
-      #     name: ${{ matrix.os }}
-      #     path: |
-      #       dist/*.exe
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 67e3480..454eeea 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,6 +1,7 @@
-v1.0.373: (Unreleased - Upcoming release)
+v1.0.373:
  - Fixed issue #356 Merged fix for Select all text in droInput on click
  - Experimental fix for MacOS / Silicon Labs USB driver (Forced RTS / CTS handshake)
+ - Re-enabled MacOS Code Signing and Notarization
 v1.0.372:
  - Updated Max Rate for LEAD1010 Plasma Add On profile
  - Added electron's app.setAppUserModelId(id) to clean up Windows notications (to be tested)
diff --git a/package.json b/package.json
index 03cf765..9863c11 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "OpenBuildsCONTROL",
-  "version": "1.0.374",
+  "version": "1.0.373",
   "license": "AGPL-3.0",
   "description": "OpenBuildsCONTROL CNC Machine Host Software",
   "author": "github.com/openbuilds <support@openbuilds.com>",