Merge pull request #21 from Venafi/archive-support-fix

distroless fix
Venafi · Jan 22, 2024 · 397cc40 · 397cc40
2 parents e6802df + edfddc6
commit 397cc40
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml
@@ -26,7 +26,12 @@ jobs:
           mv notation-venafi-csp-windows-amd64 notation-venafi-csp-windows-amd64.exe
           cp notation-venafi-csp-windows-amd64.exe notation-venafi-csp.exe
           zip notation-venafi-csp-windows-amd64.zip notation-venafi-csp.exe
-          rm notation-venafi-csp.exe
+          shasum -a 256 notation-venafi-csp-darwin-amd64.tar.gz > notation-venafi-csp-darwin-amd64.tar.gz.sha256
+          shasum -a 256 notation-venafi-csp-darwin-arm64.tar.gz > notation-venafi-csp-darwin-arm64.tar.gz.sha256
+          shasum -a 256 notation-venafi-csp-linux-amd64.tar.gz > notation-venafi-csp-linux-amd64.tar.gz.sha256
+          shasum -a 256 notation-venafi-csp-linux-arm64.tar.gz > notation-venafi-csp-linux-arm64.tar.gz.sha256
+          shasum -a 256 notation-venafi-csp-windows-amd64.zip > notation-venafi-csp-windows-amd64.zip.sha256
+          rm *.exe
       - name: Upload artifacts
         if: github.event_name != 'pull_request'
         uses: actions/upload-artifact@v3

diff --git a/Makefile b/Makefile
@@ -34,12 +34,9 @@ bin/%: cmd/% FORCE
 cross:
 	$(foreach GOOS, $(PLATFORMS),\
 		$(foreach GOARCH, $(ARCHITECTURES), $(shell export GOOS=$(GOOS); export GOARCH=$(GOARCH); \
-	go build -trimpath -ldflags "$(LDFLAGS)" -o $(PLUGIN)-$(GOOS)-$(GOARCH) ./cmd/$(PLUGIN); \
-	shasum -a 256 $(PLUGIN)-$(GOOS)-$(GOARCH) > $(PLUGIN)-$(GOOS)-$(GOARCH).sha256 ))) \
-	env GOOS=darwin GOARCH=arm64 go build -trimpath -ldflags "$(LDFLAGS)" -o $(PLUGIN)-darwin-arm64 ./cmd/$(PLUGIN)
-	shasum -a 256 $(PLUGIN)-darwin-arm64 > $(PLUGIN)-darwin-arm64.sha256
-	env GOOS=linux GOARCH=arm64 go build -trimpath -ldflags "$(LDFLAGS)" -o $(PLUGIN)-linux-arm64 ./cmd/$(PLUGIN)
-	shasum -a 256 $(PLUGIN)-linux-arm64 > $(PLUGIN)-linux-arm64.sha256
+	env CGO_ENABLED=0 go build -trimpath -ldflags "$(LDFLAGS)" -o $(PLUGIN)-$(GOOS)-$(GOARCH) ./cmd/$(PLUGIN) ))) \
+	env GOOS=darwin GOARCH=arm64 CGO_ENABLED=0 go build -trimpath -ldflags "$(LDFLAGS)" -o $(PLUGIN)-darwin-arm64 ./cmd/$(PLUGIN)
+	env GOOS=linux GOARCH=arm64 CGO_ENABLED=0 go build -trimpath -ldflags "$(LDFLAGS)" -o $(PLUGIN)-linux-arm64 ./cmd/$(PLUGIN)
 
 .PHONY: distroless
 distroless: ## build ratify-enabled venafi notation plugin for linux/amd64