From 52bc4a5b7573b38fc9f1aaee9cef4e460101b6ea Mon Sep 17 00:00:00 2001 From: Adonis Murati Date: Thu, 23 Jun 2022 11:33:44 +0200 Subject: [PATCH 1/2] OAS-4755 | small fix for terraform supported binary names --- Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index d1277a35..e5f46c0f 100644 --- a/Makefile +++ b/Makefile @@ -14,14 +14,14 @@ binaries: CGO_ENABLED=0 gox \ -osarch="linux/amd64 linux/arm linux/arm64 darwin/amd64 darwin/arm64" \ -ldflags="-X main.projectVersion=${VERSION} -X main.projectBuild=${COMMIT}" \ - -output="bin/{{.OS}}/{{.Arch}}/$(PROJECT)-$(VERSION)" \ + -output="bin/{{.OS}}/{{.Arch}}/$(PROJECT)-v$(VERSION)" \ -tags="netgo" \ ./... mkdir -p assets - cd bin/linux/amd64 ; zip -D ../../../assets/$(PROJECT)_$(VERSION)_linux_amd64.zip $(PROJECT)-$(VERSION) - cd bin/linux/arm64 ; zip -D ../../../assets/$(PROJECT)_$(VERSION)_linux_arm64.zip $(PROJECT)-$(VERSION) - cd bin/darwin/amd64 ; zip -D ../../../assets/$(PROJECT)_$(VERSION)_darwin_amd64.zip $(PROJECT)-$(VERSION) - cd bin/darwin/arm64 ; zip -D ../../../assets/$(PROJECT)_$(VERSION)_darwin_arm64.zip $(PROJECT)-$(VERSION) + cd bin/linux/amd64 ; zip -D ../../../assets/$(PROJECT)_$(VERSION)_linux_amd64.zip $(PROJECT)-v$(VERSION) + cd bin/linux/arm64 ; zip -D ../../../assets/$(PROJECT)_$(VERSION)_linux_arm64.zip $(PROJECT)-v$(VERSION) + cd bin/darwin/amd64 ; zip -D ../../../assets/$(PROJECT)_$(VERSION)_darwin_amd64.zip $(PROJECT)-v$(VERSION) + cd bin/darwin/arm64 ; zip -r ../../../assets/$(PROJECT)_$(VERSION)_darwin_arm64.zip $(PROJECT)-v$(VERSION) cp -f terraform-registry-manifest.json assets/$(PROJECT)_$(VERSION)_manifest.json cd assets ; shasum -a 256 *.zip *.json > $(PROJECT)_$(VERSION)_SHA256SUMS From fa3faf984806bd46e28ab734f2742d2f97bc8373 Mon Sep 17 00:00:00 2001 From: Adonis Murati Date: Thu, 23 Jun 2022 11:34:47 +0200 Subject: [PATCH 2/2] OAS-4755 | readd zip option --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index e5f46c0f..006937c4 100644 --- a/Makefile +++ b/Makefile @@ -21,7 +21,7 @@ binaries: cd bin/linux/amd64 ; zip -D ../../../assets/$(PROJECT)_$(VERSION)_linux_amd64.zip $(PROJECT)-v$(VERSION) cd bin/linux/arm64 ; zip -D ../../../assets/$(PROJECT)_$(VERSION)_linux_arm64.zip $(PROJECT)-v$(VERSION) cd bin/darwin/amd64 ; zip -D ../../../assets/$(PROJECT)_$(VERSION)_darwin_amd64.zip $(PROJECT)-v$(VERSION) - cd bin/darwin/arm64 ; zip -r ../../../assets/$(PROJECT)_$(VERSION)_darwin_arm64.zip $(PROJECT)-v$(VERSION) + cd bin/darwin/arm64 ; zip -D ../../../assets/$(PROJECT)_$(VERSION)_darwin_arm64.zip $(PROJECT)-v$(VERSION) cp -f terraform-registry-manifest.json assets/$(PROJECT)_$(VERSION)_manifest.json cd assets ; shasum -a 256 *.zip *.json > $(PROJECT)_$(VERSION)_SHA256SUMS