From d5ea5ff00cc98c86dc9e767e09eef2d3b63bab3a Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Thu, 18 Apr 2024 17:37:21 +0200 Subject: [PATCH] use previous version that works use dist use new flags --- .github/workflows/snapshot.yml | 2 +- .goreleaser.yaml | 5 ----- Makefile | 15 ++++++--------- 3 files changed, 7 insertions(+), 15 deletions(-) diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml index a1408c1e..d50574f3 100644 --- a/.github/workflows/snapshot.yml +++ b/.github/workflows/snapshot.yml @@ -45,7 +45,7 @@ jobs: uses: anchore/sbom-action/download-syft@v0.15.10 - name: Snapshot - run: make snapshot + run: make dist - name: generate build provenance (binaries) uses: github-early-access/generate-build-provenance@main diff --git a/.goreleaser.yaml b/.goreleaser.yaml index c829475e..c98ab646 100644 --- a/.goreleaser.yaml +++ b/.goreleaser.yaml @@ -88,8 +88,3 @@ publishers: release: # Custom GitHub release disable: true - -# creates SBOMs of all archives and the source tarball using syft -# https://goreleaser.com/customization/sbom -sboms: - - artifacts: archive \ No newline at end of file diff --git a/Makefile b/Makefile index 58f0e8f1..d1f6b6b0 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ SHELL = /bin/bash -eo pipefail -GORELEASER_VERSION = "v1.25.1" +GORELEASER_VERSION = "v1.18.0" GO_LICENSER_VERSION = "v0.4.0" GOLANGCI_LINT_VERSION = "v1.54.2" export DOCKER_IMAGE_NAME = observability/apm-lambda-extension @@ -10,23 +10,20 @@ clean: @rm -rf dist/ @docker image ls "$(DOCKER_REGISTRY)/$(DOCKER_IMAGE_NAME)*" -aq | xargs -I {} docker rmi --force {} || true +.PHONY: dist dist: - @go run github.com/goreleaser/goreleaser@$(GORELEASER_VERSION) release --snapshot --rm-dist + @go run github.com/goreleaser/goreleaser@$(GORELEASER_VERSION) release --snapshot --clean .PHONY: zip zip: - @go run github.com/goreleaser/goreleaser@$(GORELEASER_VERSION) release --snapshot --rm-dist --skip-docker + @go run github.com/goreleaser/goreleaser@$(GORELEASER_VERSION) release --snapshot --clean --skip-docker build: - @go run github.com/goreleaser/goreleaser@$(GORELEASER_VERSION) build --snapshot --rm-dist - -.PHONY: snapshot -snapshot: - go run github.com/goreleaser/goreleaser@$(GORELEASER_VERSION) release --skip=publish --snapshot --clean + @go run github.com/goreleaser/goreleaser@$(GORELEASER_VERSION) build --snapshot --clean .PHONY: release release: - go run github.com/goreleaser/goreleaser@$(GORELEASER_VERSION) release --rm-dist + go run github.com/goreleaser/goreleaser@$(GORELEASER_VERSION) release --clean .PHONY: release-notes release-notes: