Merge remote-tracking branch 'origin/master' into MI-1289-EEPROM-Sett…

…ings-Not-Applied # Conflicts: # src/server/controllers/Grblhal/GrblHalController.js
Sienci-Labs · Jan 24, 2024 · 0c82f00 · 0c82f00
2 parents 4c07b2f + 6a48775
commit 0c82f00
Show file tree

Hide file tree

Showing 35 changed files with 450 additions and 758 deletions.
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -70,12 +70,10 @@ jobs:
           PACKAGE_VERSION=`node -e "console.log(require('./src/package.json').version)"`
           mkdir -p releases/linux
           ls -al output
-          cp -af "output/${PACKAGE_NAME}-${PACKAGE_VERSION}-x86_64.AppImage" "releases/linux/${PACKAGE_NAME}-${PACKAGE_VERSION}-linux-x86_64.AppImage"
-          cp -af "output/${PACKAGE_NAME}-${PACKAGE_VERSION}-amd64.deb" "releases/linux/${PACKAGE_NAME}-${PACKAGE_VERSION}-linux-amd64.deb"
-          cp -af "output/${PACKAGE_NAME}-${PACKAGE_VERSION}-armv7l.AppImage" "releases/linux/${PACKAGE_NAME}-${PACKAGE_VERSION}-linux-armv7l.AppImage"
-          cp -af "output/${PACKAGE_NAME}-${PACKAGE_VERSION}-armv7l.deb" "releases/linux/${PACKAGE_NAME}-${PACKAGE_VERSION}-linux-armv7l.deb"
-          cp -af "output/${PACKAGE_NAME}-${PACKAGE_VERSION}-arm64.AppImage" "releases/linux/${PACKAGE_NAME}-${PACKAGE_VERSION}-linux-arm64.AppImage"
-          cp -af "output/${PACKAGE_NAME}-${PACKAGE_VERSION}-arm64.deb" "releases/linux/${PACKAGE_NAME}-${PACKAGE_VERSION}-linux-arm64.deb"
+          cp -af "output/${PACKAGE_NAME}-${PACKAGE_VERSION}-x86_64.AppImage" "releases/linux/${PACKAGE_NAME}-${PACKAGE_VERSION}-Linux-Intel-64Bit.AppImage"
+          cp -af "output/${PACKAGE_NAME}-${PACKAGE_VERSION}-amd64.deb" "releases/linux/${PACKAGE_NAME}-${PACKAGE_VERSION}-Linux-Intel-64Bit.deb"
+          cp -af "output/${PACKAGE_NAME}-${PACKAGE_VERSION}-arm64.AppImage" "releases/linux/${PACKAGE_NAME}-${PACKAGE_VERSION}-Linux-ARM-64Bit.AppImage"
+          cp -af "output/${PACKAGE_NAME}-${PACKAGE_VERSION}-arm64.deb" "releases/linux/${PACKAGE_NAME}-${PACKAGE_VERSION}-Linux-ARM-64Bit.deb"
           ls -al output releases/linux
           if [[ "$GITHUB_REF_TYPE" == "branch" && "$GITHUB_REF_NAME" == "master" ]]; then
             yarn github-release delete \

diff --git a/README.md b/README.md
@@ -20,9 +20,12 @@ Some things that we’re looking to accomplish with this sender:
 ## 💻 Download [![Github All Releases](https://img.shields.io/github/downloads/Sienci-Labs/gsender/total.svg)]()
 
 gSender is available for the following systems and does not yet support headless Pi operation
-| ![Windows](https://github.com/EgoistDeveloper/operating-system-logos/blob/master/src/48x48/WIN.png)<br>Windows (x32) | ![Windows](https://github.com/EgoistDeveloper/operating-system-logos/blob/master/src/48x48/WIN.png)<br>Windows (x64) | ![Mac](https://github.com/EgoistDeveloper/operating-system-logos/blob/master/src/48x48/MAC.png)<br>Mac (Intel) | ![Mac](https://github.com/EgoistDeveloper/operating-system-logos/blob/master/src/48x48/MAC.png)<br>Mac (ARM64) | ![Linux](https://github.com/EgoistDeveloper/operating-system-logos/blob/master/src/48x48/LIN.png)<br>Linux | ![RasPi](https://github.com/iiiypuk/rpi-icon/blob/master/48.png)<br>Pi (32) | ![RasPi](https://github.com/iiiypuk/rpi-icon/blob/master/48.png)<br>Pi (64) | 
-|-|-|-|-|-|-|-
- ``` Available ``` [EXE](https://github.com/Sienci-Labs/gsender/releases/download/v1.2.2/gSender-1.2.2-x32.exe) | ``` Available ``` [EXE](https://github.com/Sienci-Labs/gsender/releases/download/v1.2.2/gSender-1.2.2-x64.exe) | ``` Available ``` [DMG](https://github.com/Sienci-Labs/gsender/releases/download/v1.2.2/gSender-1.2.2.dmg) | ``` Available ``` [DMG](https://github.com/Sienci-Labs/gsender/releases/download/v1.2.2/gSender-1.2.2-arm64.dmg) | ``` Available ``` [DEB](https://github.com/Sienci-Labs/gsender/releases/download/v1.2.2/gSender_1.2.2_amd64.deb) | ``` Available ``` [ApIm](https://github.com/Sienci-Labs/gsender/releases/download/v1.2.2/gSender-1.2.2-armv7l.AppImage)| ``` Available ``` [DEB](https://github.com/Sienci-Labs/gsender/releases/download/v1.2.2/gSender_1.2.2_bullseye.deb)
+
+| Windows (x64) | Mac (Intel) | Linux (Intel)                                                                                                     | Linux (ARM)                                                                                                       | Pi (64 bit)                                                                                                                       |
+|---|---|-------------------------------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------|
+|  |  |                                                                                                                   |                                                                                                                   |                                                                                                                                   |
+| ```  Available  ```  [EXE](https://github.com/Sienci-Labs/gsender/releases/download/v1.4.0/gSender-1.4.0-Windows-64Bit.exe) | ```  Available  ```  [DMG](https://github.com/Sienci-Labs/gsender/releases/download/v1.4.0/gSender-1.4.0-Mac-Intel-64Bit.dmg) | ```  Available  ```  [DEB](https://github.com/Sienci-Labs/gsender/releases/download/v1.4.0/gSender-Edge-1.4.0-Linux-Intel-64Bit.deb) | ```  Available  ```  [DEB](https://github.com/Sienci-Labs/gsender/releases/download/v1.4.0/gSender-Edge-1.4.0-Linux-ARM-64Bit.deb) | ```  Available  ```  [DEB](https://github.com/Sienci-Labs/gsender/releases/download/v1.4.0/gSender-Edge-1.4.0-Linux-PI-64Bit.deb) |
+     
 
 [Check out the latest releases here.](https://github.com/Sienci-Labs/gsender/releases/)
 
@@ -99,9 +102,9 @@ gSender is also designed in a way that it can be run locally on your computer br
 
 ## 🕣 Development History
 
-### 1.4.0 (January X, 2024)
+### 1.4.0 (January 23, 2024)
 - Added Rotary Mode
-  - gSender is now able to run 4 axis files on both GRBL and grblHAL
+  - gSender is now able to run 2+1 axis files on grbl and 4 axis files on grblHAL
   - Visualizer updated to support 4 axis rotations
   - A-axis DRO and jogging
   - Rotary probing

diff --git a/WindowsSigner.js b/WindowsSigner.js
@@ -0,0 +1,31 @@
+const { execSync } = require('child_process');
+
+
+/**
+ * Custom signing utility
+ * Required environment variables:
+ *      KEYPAIR_ALIAS - KSP keypair from Digicert
+ * @param config
+ * @returns {Promise<void>}
+ */
+
+
+// eslint-disable-next-line require-await
+exports.default = async (config) => {
+    const keypairAlias = process.env.KEYPAIR_ALIAS;
+    const path = config.path ? String(config.path) : '';
+
+    if (process.platform !== 'win32' || !keypairAlias || !path) {
+        throw new Error('Either win32, no keypair or path not found');
+    }
+
+    const output = execSync(
+        `smctl sign --keypair-alias=${keypairAlias} --input="${path}" --verbose`,
+    )
+        .toString()
+        .trim();
+
+    if (!output.includes('Done Adding Additional Store')) {
+        throw new Error(`Failed to sign executable: ${output}`);
+    }
+};