Merge pull request #85 from RobotsAndPencils/fix/useCorrectArchitecture

fix: support intel mac architecture
RobotsAndPencils · Oct 16, 2024 · 0222226 · 0222226
2 parents 325bfa6 + 9516ebc
commit 0222226
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,6 @@
-## 3.0.2
+## 3.1.0
 
-- Adds ability to turn on debug logging for 1Password CLI commands
+- Adds back support for intel based mac
 
 ## 3.0.0
 

diff --git a/dist/index.js b/dist/index.js
diff --git a/dist/index.js.map b/dist/index.js.map
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "1password-action",
-  "version": "3.0.4",
+  "version": "3.1.0",
   "private": true,
   "description": "Import items from 1Password securely",
   "main": "lib/main.js",

diff --git a/src/install.ts b/src/install.ts
@@ -9,10 +9,10 @@ const KEY_FINGERPRINT = '3FEF9748469ADBE15DA7CA80AC2D62742012EA22'
 
 export async function install(onePasswordVersion: string): Promise<void> {
   const platform = os.platform().toLowerCase()
+  let arch = os.arch() // This will return 'x64' for Intel and 'arm64' for Apple Silicon
 
-  let arch = 'amd64'
-  if (platform === 'darwin') {
-    arch = 'arm64'
+  if (arch === 'x64') {
+    arch = 'amd64'
   }
   const onePasswordUrl = `https://cache.agilebits.com/dist/1P/op2/pkg/v${onePasswordVersion}/op_${platform}_${arch}_v${onePasswordVersion}.zip`
   core.info(