From 0cd2a8a6c0c1c082df73771d9b0bec4cf6dbc664 Mon Sep 17 00:00:00 2001 From: Koushik Dey <57134947+koushdey@users.noreply.github.com> Date: Fri, 22 Jul 2022 19:35:45 +0000 Subject: [PATCH 1/4] Adding support for windows-arm64 Signed-off-by: Koushik Dey <57134947+koushdey@users.noreply.github.com> --- Makefile | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index dc75f8948..ca2e2f095 100644 --- a/Makefile +++ b/Makefile @@ -64,10 +64,17 @@ build-mac-arm64: -o bin/darwin/arm64/$(CLI_EXE) $(CLI_PKG) .PHONY: build-windows -build-windows: +build-windows: build-windows-amd64 build-windows-arm64 + +.PHONY: build-windows-amd64: GOARCH=amd64 CGO_ENABLED=0 GOOS=windows go build -v --ldflags="$(LDFLAGS)" \ -o bin/windows/amd64/$(CLI_EXE).exe $(CLI_PKG) +.PHONY: build-windows-arm64 +build-windows: + GOARCH=arm64 CGO_ENABLED=0 GOOS=windows go build -v --ldflags="$(LDFLAGS)" \ + -o bin/windows/arm64/$(CLI_EXE).exe $(CLI_PKG) + .PHONY: check-encoding check-encoding: ! find cmd internal -name "*.go" -type f -exec file "{}" ";" | grep CRLF From 131736bcc790e543fcb3c4caed1c6b52204881a8 Mon Sep 17 00:00:00 2001 From: Koushik Dey <57134947+koushdey@users.noreply.github.com> Date: Thu, 28 Jul 2022 08:06:14 +0000 Subject: [PATCH 2/4] Fixing failures in makefile Signed-off-by: Koushik Dey <57134947+koushdey@users.noreply.github.com> --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index ca2e2f095..7b6a9b224 100644 --- a/Makefile +++ b/Makefile @@ -66,7 +66,7 @@ build-mac-arm64: .PHONY: build-windows build-windows: build-windows-amd64 build-windows-arm64 -.PHONY: build-windows-amd64: +.PHONY: build-windows-amd64 GOARCH=amd64 CGO_ENABLED=0 GOOS=windows go build -v --ldflags="$(LDFLAGS)" \ -o bin/windows/amd64/$(CLI_EXE).exe $(CLI_PKG) From 5f4fd3404c486fc463600e96f4d7615c3fa59b0a Mon Sep 17 00:00:00 2001 From: Koushik Dey <57134947+koushdey@users.noreply.github.com> Date: Mon, 1 Aug 2022 14:35:08 +0000 Subject: [PATCH 3/4] Addressed review comments Signed-off-by: Koushik Dey <57134947+koushdey@users.noreply.github.com> --- Makefile | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 7b6a9b224..7c73a2fc3 100644 --- a/Makefile +++ b/Makefile @@ -65,16 +65,14 @@ build-mac-arm64: .PHONY: build-windows build-windows: build-windows-amd64 build-windows-arm64 - .PHONY: build-windows-amd64 +build-windows-amd64: GOARCH=amd64 CGO_ENABLED=0 GOOS=windows go build -v --ldflags="$(LDFLAGS)" \ -o bin/windows/amd64/$(CLI_EXE).exe $(CLI_PKG) - .PHONY: build-windows-arm64 -build-windows: +build-windows-arm64: GOARCH=arm64 CGO_ENABLED=0 GOOS=windows go build -v --ldflags="$(LDFLAGS)" \ -o bin/windows/arm64/$(CLI_EXE).exe $(CLI_PKG) - .PHONY: check-encoding check-encoding: ! find cmd internal -name "*.go" -type f -exec file "{}" ";" | grep CRLF From 4cd116cf79a128bafc7cfbac3c4d387685844777 Mon Sep 17 00:00:00 2001 From: Shiwei Zhang Date: Wed, 10 Aug 2022 16:40:28 +0800 Subject: [PATCH 4/4] format Makefile with newlines Signed-off-by: Shiwei Zhang --- Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Makefile b/Makefile index 7c73a2fc3..6cc94600f 100644 --- a/Makefile +++ b/Makefile @@ -65,14 +65,17 @@ build-mac-arm64: .PHONY: build-windows build-windows: build-windows-amd64 build-windows-arm64 + .PHONY: build-windows-amd64 build-windows-amd64: GOARCH=amd64 CGO_ENABLED=0 GOOS=windows go build -v --ldflags="$(LDFLAGS)" \ -o bin/windows/amd64/$(CLI_EXE).exe $(CLI_PKG) + .PHONY: build-windows-arm64 build-windows-arm64: GOARCH=arm64 CGO_ENABLED=0 GOOS=windows go build -v --ldflags="$(LDFLAGS)" \ -o bin/windows/arm64/$(CLI_EXE).exe $(CLI_PKG) + .PHONY: check-encoding check-encoding: ! find cmd internal -name "*.go" -type f -exec file "{}" ";" | grep CRLF