Skip to content

Commit 0222226

Browse files
authored
Merge pull request #85 from RobotsAndPencils/fix/useCorrectArchitecture
fix: support intel mac architecture
2 parents 325bfa6 + 9516ebc commit 0222226

File tree

5 files changed

+10
-10
lines changed

5 files changed

+10
-10
lines changed

Diff for: CHANGELOG.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
## 3.0.2
1+
## 3.1.0
22

3-
- Adds ability to turn on debug logging for 1Password CLI commands
3+
- Adds back support for intel based mac
44

55
## 3.0.0
66

Diff for: dist/index.js

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: dist/index.js.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "1password-action",
3-
"version": "3.0.4",
3+
"version": "3.1.0",
44
"private": true,
55
"description": "Import items from 1Password securely",
66
"main": "lib/main.js",

Diff for: src/install.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ const KEY_FINGERPRINT = '3FEF9748469ADBE15DA7CA80AC2D62742012EA22'
99

1010
export async function install(onePasswordVersion: string): Promise<void> {
1111
const platform = os.platform().toLowerCase()
12+
let arch = os.arch() // This will return 'x64' for Intel and 'arm64' for Apple Silicon
1213

13-
let arch = 'amd64'
14-
if (platform === 'darwin') {
15-
arch = 'arm64'
14+
if (arch === 'x64') {
15+
arch = 'amd64'
1616
}
1717
const onePasswordUrl = `https://cache.agilebits.com/dist/1P/op2/pkg/v${onePasswordVersion}/op_${platform}_${arch}_v${onePasswordVersion}.zip`
1818
core.info(

0 commit comments

Comments
 (0)