From 42e67572763032f291262d4ed6c13e4ef4a250f0 Mon Sep 17 00:00:00 2001 From: Dan Date: Mon, 31 Jul 2023 15:39:44 -0700 Subject: [PATCH] Add Linux ARM64 support --- cli/client.go | 6 +++++- cli/consts.go | 3 ++- cli/makefile | 7 ++++++- frontend/src/components/history.jsx | 8 +++++--- 4 files changed, 18 insertions(+), 6 deletions(-) diff --git a/cli/client.go b/cli/client.go index 4f60d108..ce754762 100644 --- a/cli/client.go +++ b/cli/client.go @@ -222,7 +222,11 @@ func (c *Client) ListProviders(ctx context.Context, opts *ListProvidersOptions) func getBinaryName() string { switch runtime.GOOS { case "linux": - return LinuxBinaryName + if runtime.GOARCH == "arm64" { + return LinuxArm64BinaryName + } + + return LinuxAmd64BinaryName case "windows": return WindowsBinaryName default: diff --git a/cli/consts.go b/cli/consts.go index ccb8ee82..374aedbf 100644 --- a/cli/consts.go +++ b/cli/consts.go @@ -23,7 +23,8 @@ const DefaultTimeRemaining uint = 5 var DownloadURL string = "URL not set yet" // CLI binary names -const LinuxBinaryName string = "keyconjurer-linux" +const LinuxAmd64BinaryName string = "keyconjurer-linux-amd64" +const LinuxArm64BinaryName string = "keyconjurer-linux-arm64" const WindowsBinaryName string = "keyconjurer-windows.exe" const DarwinArm64BinaryName string = "keyconjurer-darwin-arm64" const DarwinAmd64BinaryName string = "keyconjurer-darwin-amd64" diff --git a/cli/makefile b/cli/makefile index 367e5332..122463e5 100644 --- a/cli/makefile +++ b/cli/makefile @@ -19,13 +19,18 @@ endif .PHONY: all build dir test build_requirements all: \ - ../builds/$(RELEASE)/cli/keyconjurer-linux \ + ../builds/$(RELEASE)/cli/keyconjurer-linux-arm64 \ + ../builds/$(RELEASE)/cli/keyconjurer-linux-amd64 \ ../builds/$(RELEASE)/cli/keyconjurer-darwin-amd64 \ ../builds/$(RELEASE)/cli/keyconjurer-darwin-arm64 \ ../builds/$(RELEASE)/cli/keyconjurer-windows.exe ../builds/$(RELEASE)/cli/keyconjurer-linux: +../builds/$(RELEASE)/cli/keyconjurer-linux-arm64: +../builds/$(RELEASE)/cli/keyconjurer-linux-amd64: GOOS=linux GOARCH=amd64 BUILD_TARGET=keyconjurer-linux $(MAKE) build + GOOS=linux GOARCH=arm64 BUILD_TARGET=keyconjurer-linux-arm64 $(MAKE) build + cp ../builds/$(RELEASE)/cli/keyconjurer-linux ../builds/$(RELEASE)/cli/keyconjurer-linux-arm64 ../builds/$(RELEASE)/cli/keyconjurer-darwin: ../builds/$(RELEASE)/cli/keyconjurer-darwin-amd64: diff --git a/frontend/src/components/history.jsx b/frontend/src/components/history.jsx index 491b55b0..4c0d2b05 100644 --- a/frontend/src/components/history.jsx +++ b/frontend/src/components/history.jsx @@ -31,11 +31,13 @@ const History = () => ( {`${binaryName}`}-darwin (osx)
- - {`${binaryName}`}-darwin (osx M1/M2) + + {`${binaryName}`}-linux AMD64 (This is probably the one you want)
- {`${binaryName}`}-linux + + {`${binaryName}`}-linux ARM64 +
{`${binaryName}`}-windows