From 6cae56f02b1409fc54d477e4e74786e29d2895c4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 25 Jun 2024 22:30:41 +0000 Subject: [PATCH] :seedling: Bump goreleaser/goreleaser-action from 5.1.0 to 6.0.0 (#4158) * :seedling: Bump goreleaser/goreleaser-action from 5.1.0 to 6.0.0 Bumps [goreleaser/goreleaser-action](https://github.com/goreleaser/goreleaser-action) from 5.1.0 to 6.0.0. - [Release notes](https://github.com/goreleaser/goreleaser-action/releases) - [Commits](https://github.com/goreleaser/goreleaser-action/compare/5742e2a039330cbb23ebf35f046f814d4c6ff811...286f3b13b1b49da4ac219696163fb8c1c93e1200) --- updated-dependencies: - dependency-name: goreleaser/goreleaser-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] * use --clean instead of --rm-dist https: //goreleaser.com/deprecations#-rm-dist Signed-off-by: Spencer Schrock * the skip arguments were combined into --skip https://goreleaser.com/deprecations/#-skip Signed-off-by: Spencer Schrock * update config for v2 Signed-off-by: Spencer Schrock * use goreleaser v2 tooling for makefile Signed-off-by: Spencer Schrock --------- Signed-off-by: dependabot[bot] Signed-off-by: Spencer Schrock Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Spencer Schrock Co-authored-by: Stephen Augustus --- .github/workflows/goreleaser.yaml | 2 +- .goreleaser.yml | 3 ++- Makefile | 4 ++-- tools/go.mod | 2 +- tools/go.sum | 4 ++-- tools/tools.go | 2 +- 6 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.github/workflows/goreleaser.yaml b/.github/workflows/goreleaser.yaml index 977760ad..c40f0533 100644 --- a/.github/workflows/goreleaser.yaml +++ b/.github/workflows/goreleaser.yaml @@ -52,7 +52,7 @@ jobs: run: echo "version_flags=$(./scripts/version-ldflags)" >> "$GITHUB_OUTPUT" - name: Run GoReleaser id: run-goreleaser - uses: goreleaser/goreleaser-action@5742e2a039330cbb23ebf35f046f814d4c6ff811 # v5.1.0 + uses: goreleaser/goreleaser-action@286f3b13b1b49da4ac219696163fb8c1c93e1200 # v6.0.0 with: args: release --clean env: diff --git a/.goreleaser.yml b/.goreleaser.yml index d2e1bdeb..f0680fea 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -1,3 +1,4 @@ +version: 2 project_name: scorecard env: - GO111MODULE=on @@ -96,7 +97,7 @@ snapshot: changelog: # Set it to true if you wish to skip the changelog generation. # This may result in an empty release notes on GitHub/GitLab/Gitea. - skip: false + disable: false release: footer: | ### Thanks for all contributors! diff --git a/Makefile b/Makefile index a1a1c831..18bd66ba 100644 --- a/Makefile +++ b/Makefile @@ -45,7 +45,7 @@ $(GINKGO): $(TOOLS_DIR)/go.mod GORELEASER := $(TOOLS_BIN_DIR)/goreleaser $(GORELEASER): $(TOOLS_DIR)/go.mod - cd $(TOOLS_DIR); GOBIN=$(TOOLS_BIN_DIR) go install github.com/goreleaser/goreleaser + cd $(TOOLS_DIR); GOBIN=$(TOOLS_BIN_DIR) go install github.com/goreleaser/goreleaser/v2 PROTOC_GEN_GO := $(TOOLS_BIN_DIR)/protoc-gen-go $(PROTOC_GEN_GO): $(TOOLS_DIR)/go.mod @@ -200,7 +200,7 @@ scorecard.releaser: .goreleaser.yml $(SCORECARD_DEPS) | $(GORELEASER) # Run go releaser on the Scorecard repo $(GORELEASER) check && \ VERSION_LDFLAGS="$(LDFLAGS)" $(GORELEASER) release \ - --snapshot --rm-dist --skip-publish --skip-sign && \ + --snapshot --clean --skip=publish,sign && \ touch scorecard.releaser CRON_CONTROLLER_DEPS = $(shell find cron/internal/ -iname "*.go") diff --git a/tools/go.mod b/tools/go.mod index 0242ca04..359e8cb5 100644 --- a/tools/go.mod +++ b/tools/go.mod @@ -7,7 +7,7 @@ require ( github.com/golangci/golangci-lint v1.59.1 github.com/google/addlicense v1.1.1 github.com/google/ko v0.15.4 - github.com/goreleaser/goreleaser v1.26.2 + github.com/goreleaser/goreleaser/v2 v2.0.0 github.com/onsi/ginkgo/v2 v2.19.0 google.golang.org/protobuf v1.34.2 ) diff --git a/tools/go.sum b/tools/go.sum index 59791760..f4ebf0de 100644 --- a/tools/go.sum +++ b/tools/go.sum @@ -558,8 +558,8 @@ github.com/goreleaser/chglog v0.6.1 h1:NZKiX8l0FTQPRzBgKST7knvNZmZ04f7PEGkN2wInf github.com/goreleaser/chglog v0.6.1/go.mod h1:Bnnfo07jMZkaAb0uRNASMZyOsX6ROW6X1qbXqN3guUo= github.com/goreleaser/fileglob v1.3.0 h1:/X6J7U8lbDpQtBvGcwwPS6OpzkNVlVEsFUVRx9+k+7I= github.com/goreleaser/fileglob v1.3.0/go.mod h1:Jx6BoXv3mbYkEzwm9THo7xbr5egkAraxkGorbJb4RxU= -github.com/goreleaser/goreleaser v1.26.2 h1:1iY1HaXtRiMTrwy6KE1sNjkRjsjMi+9l0k6WUX8GpWw= -github.com/goreleaser/goreleaser v1.26.2/go.mod h1:mHi6zr6fuuOh5eHdWWgyo/N8BWED5WEVtb/4GETc9jQ= +github.com/goreleaser/goreleaser/v2 v2.0.0 h1:TxH7v+rYsQ+e4CQDMmdBFnVzxuTbBJRwsLXeCSkOREU= +github.com/goreleaser/goreleaser/v2 v2.0.0/go.mod h1:eit+2+u8uJLgBtuEMITPaQHwO55amhR089eFkbWi3s0= github.com/goreleaser/nfpm/v2 v2.37.1 h1:RUmeEt8OlEVeSzKRrO5Vl5qVWCtUwx4j9uivGuRo5fw= github.com/goreleaser/nfpm/v2 v2.37.1/go.mod h1:q8+sZXFqn106/eGw+9V+I8+izFxZ/sJjrhwmEUxXhUg= github.com/gorilla/mux v1.8.1 h1:TuBL49tXwgrFYWhqrNgrUNEY92u81SPhu7sTdzQEiWY= diff --git a/tools/tools.go b/tools/tools.go index 2ff7d10c..f0b287d8 100644 --- a/tools/tools.go +++ b/tools/tools.go @@ -23,7 +23,7 @@ import ( _ "github.com/google/addlicense" _ "github.com/google/ko" - _ "github.com/goreleaser/goreleaser" + _ "github.com/goreleaser/goreleaser/v2" _ "github.com/onsi/ginkgo/v2/ginkgo" _ "google.golang.org/protobuf/cmd/protoc-gen-go" )