Merge branch 'feature/sc-126222/update-the-particle-cli-executable-in…

…-workbench' of github.com:particle-iot/particle-cli into feature/sc-126222/update-the-particle-cli-executable-in-workbench
particle-iot · May 3, 2024 · 1665b99 · 1665b99
2 parents 870a191 + 831270c
commit 1665b99
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 6 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -5,7 +5,6 @@ on:
     branches: [ "master", "feature/cli-installer-v2" ] # should change once we have a stable branch
   pull_request:
     branches: [ "master", "feature/cli-installer-v2" ]
-
 jobs:
   call-tests:
     uses: ./.github/workflows/tests.yml

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -26,6 +26,7 @@ env:
   E2E_PRODUCT_01_ID: ${{ secrets.E2E_PRODUCT_01_ID }}
   E2E_PRODUCT_01_NAME: ${{ secrets.E2E_PRODUCT_01_NAME }}
   E2E_USERNAME: ${{ secrets.E2E_USERNAME }}
+
 jobs:
   unit-test:
     runs-on: ${{ matrix.os }}

diff --git a/installer/unix/install-cli b/installer/unix/install-cli
@@ -41,7 +41,13 @@ esac
 PROCESSOR=$(uname -m)
 case $PROCESSOR in
     x86_64)
-        ARCH="amd64"
+        ARCH="x64"
+        ;;
+    aarch64)
+        ARCH="arm64"
+        ;;
+    arm64)
+        ARCH="arm64"
         ;;
     arm*)
         ARCH="arm"

diff --git a/package.json b/package.json
@@ -169,7 +169,8 @@
       "node16-macos-x64",
       "node16-macos-arm64",
       "node16-win-x64",
-      "node16-linux-arm"
+      "node16-linux-arm",
+      "node16-linux-arm64"
     ],
     "assets": [
       "./assets/**",

diff --git a/scripts/generate-manifest.js b/scripts/generate-manifest.js
@@ -29,9 +29,6 @@ function parseFilename(filename) {
 	if (parts.length > 3) {
 		arch = parts[3].split('.')[0];
 	}
-	if (arch?.includes('arm')) {
-		arch = 'arm';
-	}
 	return {
 		platform: platformMap[parts[2]] || parts[2],
 		arch: arch // Removing file extension if present