From 5f87684d9e3b8096d48e5ac62e732918ddf2965f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20L=C3=A9one?= Date: Wed, 10 Mar 2021 12:01:01 +0100 Subject: [PATCH 1/2] feat: enable darwin/arm64 (M1) during build time --- scripts/build.sh | 3 +++ scripts/release/release.js | 1 + 2 files changed, 4 insertions(+) diff --git a/scripts/build.sh b/scripts/build.sh index 5baecf7922..6192041dc0 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -22,6 +22,7 @@ VERSION=$(go run cmd/scw/main.go -o json version | jq -r .version) BIN_LINUX="$BIN_DIR/scw-$VERSION-linux-x86_64" BIN_LINUX_386="$BIN_DIR/scw-$VERSION-linux-386" BIN_DARWIN="$BIN_DIR/scw-$VERSION-darwin-x86_64" +BIN_DARWIN_ARM64="$BIN_DIR/scw-$VERSION-darwin-arm64" BIN_WINDOWS="$BIN_DIR/scw-$VERSION-windows-x86_64.exe" BIN_WINDOWS_386="$BIN_DIR/scw-$VERSION-windows-386.exe" @@ -31,11 +32,13 @@ GOOS=linux GOARCH=386 go build -ldflags "${LDFLAGS[*]}" -o "$BIN_LINUX_386" cmd GOOS=darwin GOARCH=amd64 go build -ldflags "${LDFLAGS[*]}" -o "$BIN_DARWIN" cmd/scw/main.go GOOS=windows GOARCH=amd64 go build -ldflags "${LDFLAGS[*]}" -o "$BIN_WINDOWS" cmd/scw/main.go GOOS=windows GOARCH=386 go build -ldflags "${LDFLAGS[*]}" -o "$BIN_WINDOWS_386" cmd/scw/main.go +GOOS=darwin GOARCH=arm64 go build -ldflags "${LDFLAGS[*]}" -o "$BIN_DARWIN_ARM64" cmd/scw/main.go shasum -a 256 \ "$BIN_LINUX" \ "$BIN_LINUX_386" \ "$BIN_DARWIN" \ + "$BIN_DARWIN_ARM64" \ "$BIN_WINDOWS" \ "$BIN_WINDOWS_386" \ | sed -e 's#./bin/##' > "$BIN_DIR/SHA256SUMS" diff --git a/scripts/release/release.js b/scripts/release/release.js index a51cf13660..0609456649 100644 --- a/scripts/release/release.js +++ b/scripts/release/release.js @@ -215,6 +215,7 @@ async function main() { console.log(" attach assets to the release".gray); const releaseAssets = [ `scw-${newVersion}-darwin-x86_64`, + `scw-${newVersion}-darwin-arm64`, `scw-${newVersion}-linux-x86_64`, `scw-${newVersion}-linux-386`, `scw-${newVersion}-windows-x86_64.exe`, From 788e999821f1d13749d766f9e825c9411219cdf8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20L=C3=A9one?= Date: Wed, 10 Mar 2021 13:35:58 +0100 Subject: [PATCH 2/2] fix go version --- go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go.mod b/go.mod index dc2deaccc4..1b6fe0c1ee 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/scaleway/scaleway-cli -go 1.12 +go 1.16 require ( github.com/alecthomas/assert v0.0.0-20170929043011-405dbfeb8e38