diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c4618da3a..0822e33bb 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -54,11 +54,11 @@ jobs: echo 'GITHUB_TOKEN=${{secrets.GITHUB_TOKEN}}' > .release-env - name: Run GoReleaser id: run-goreleaser - uses: goreleaser/goreleaser-action@v4 + uses: goreleaser/goreleaser-action@v6 with: distribution: goreleaser - version: latest - args: release --skip-validate -f release/tag/goreleaser.yaml + version: "~> v2" + args: release --skip=validate -f release/tag/goreleaser.yaml env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Generate SLSA subjects for provenance diff --git a/Makefile b/Makefile index 135b46421..da0b4f54c 100644 --- a/Makefile +++ b/Makefile @@ -171,7 +171,7 @@ release-dry-run: -w /go/src/github.com/GoogleContainerTools/kpt \ $(GORELEASER_IMAGE) \ -f "$(GORELEASER_CONFIG)" \ - --skip-validate --skip-publish + --skip=validate,publish release: @if [ ! -f ".release-env" ]; then \ @@ -187,7 +187,7 @@ release: -w /go/src/github.com/GoogleContainerTools/kpt \ $(GORELEASER_IMAGE) \ -f "$(GORELEASER_CONFIG)" release \ - --skip-validate + --skip=validate release-ci: @if [ ! -f ".release-env" ]; then \ @@ -204,7 +204,7 @@ release-ci: -w /go/src/github.com/GoogleContainerTools/kpt \ $(GORELEASER_IMAGE) \ -f "$(GORELEASER_CONFIG)" release \ - --skip-validate + --skip=validate .PHONY: vulncheck vulncheck: build diff --git a/release/tag/goreleaser.yaml b/release/tag/goreleaser.yaml index 7890b8d7a..a73726455 100644 --- a/release/tag/goreleaser.yaml +++ b/release/tag/goreleaser.yaml @@ -19,6 +19,7 @@ # matrix of GOOS and GOARCH combinations, but instead, we'd need to define separate # steps for each targetted OS and ARCH. This is because we need to specify the # platform specific C std library (libc) and cross-compiler to be used. +version: 2 env: - CGO_ENABLED=0 - GO111MODULE=on