Merge pull request #247 from cert-manager/goreleaser-v2

Use goreleaser v2

Author: cert-manager-prow[bot]

.goreleaser.yml

@@ -1,3 +1,5 @@
+version: 2
+
 # Our Makefile will automatically add additional settings
 # to this builds array (environment variables, flags, ...)
 builds:
@@ -33,11 +35,11 @@ signs:
 
 archives:
   - name_template: "{{ .Binary }}_{{ .Os }}_{{ .Arch }}"
-    format: binary
-    
+    formats: ["binary"]
+
   - id: tar-gz-archives
     name_template: "{{ .Binary }}_{{ .Os }}_{{ .Arch }}"
-    format: tar.gz
+    formats: ["tar.gz"]
 
 release:
   draft: true

klone.yaml

@@ -10,45 +10,45 @@ targets:
     - folder_name: boilerplate
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 292a53c31aee0d1909bd25f204c602aad911f3a4
+      repo_hash: e869982cec38c8ecfdb899fc63dd4e148e509fa5
       repo_path: modules/boilerplate
     - folder_name: cert-manager
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 292a53c31aee0d1909bd25f204c602aad911f3a4
+      repo_hash: e869982cec38c8ecfdb899fc63dd4e148e509fa5
       repo_path: modules/cert-manager
     - folder_name: executable
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 292a53c31aee0d1909bd25f204c602aad911f3a4
+      repo_hash: e869982cec38c8ecfdb899fc63dd4e148e509fa5
       repo_path: modules/executable
     - folder_name: generate-verify
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 292a53c31aee0d1909bd25f204c602aad911f3a4
+      repo_hash: e869982cec38c8ecfdb899fc63dd4e148e509fa5
       repo_path: modules/generate-verify
     - folder_name: go
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 292a53c31aee0d1909bd25f204c602aad911f3a4
+      repo_hash: e869982cec38c8ecfdb899fc63dd4e148e509fa5
       repo_path: modules/go
     - folder_name: help
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 292a53c31aee0d1909bd25f204c602aad911f3a4
+      repo_hash: e869982cec38c8ecfdb899fc63dd4e148e509fa5
       repo_path: modules/help
     - folder_name: klone
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 292a53c31aee0d1909bd25f204c602aad911f3a4
+      repo_hash: e869982cec38c8ecfdb899fc63dd4e148e509fa5
       repo_path: modules/klone
     - folder_name: repository-base
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 292a53c31aee0d1909bd25f204c602aad911f3a4
+      repo_hash: e869982cec38c8ecfdb899fc63dd4e148e509fa5
       repo_path: modules/repository-base
     - folder_name: tools
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 292a53c31aee0d1909bd25f204c602aad911f3a4
+      repo_hash: e869982cec38c8ecfdb899fc63dd4e148e509fa5
       repo_path: modules/tools

make/_shared/executable/01_mod.mk

@@ -57,7 +57,7 @@ define template_for_target
 	$(YQ) 'with(.builds[]; select(.id == "$(1)") | .ldflags[0] = "-s")' | \
 	$(YQ) 'with(.builds[]; select(.id == "$(1)") | .ldflags[1] = "-w")' | \
 	$(YQ) 'with(.builds[]; select(.id == "$(1)") | .ldflags[2] = "$(go_$1_ldflags)")' | \
-	$(YQ) 'with(.builds[]; select(.id == "$(1)") | .gobinary = "$(GO)")' | \
+	$(YQ) 'with(.builds[]; select(.id == "$(1)") | .tool = "$(GO)")' | \
 	targets=$(exe_targets) $(YQ) 'with(.builds[]; select(.id == "$(1)") | .targets = (env(targets) | split(",")))' |
 endef
 

make/_shared/tools/00_mod.mk

@@ -121,8 +121,8 @@ detected_ginkgo_version := $(shell [[ -f go.mod ]] && awk '/ginkgo\/v2/ {print $
 tools += ginkgo=$(detected_ginkgo_version)
 # https://pkg.go.dev/github.com/cert-manager/klone?tab=versions
 tools += klone=v0.2.0
-# https://pkg.go.dev/github.com/goreleaser/goreleaser?tab=versions
-tools += goreleaser=v1.26.2
+# https://pkg.go.dev/github.com/goreleaser/goreleaser/v2?tab=versions
+tools += goreleaser=v2.11.0
 # https://pkg.go.dev/github.com/anchore/syft/cmd/syft?tab=versions
 tools += syft=v1.28.0
 # https://github.com/cert-manager/helm-tool/releases
@@ -338,7 +338,7 @@ go_dependencies += boilersuite=github.com/cert-manager/boilersuite
 go_dependencies += gomarkdoc=github.com/princjef/gomarkdoc/cmd/gomarkdoc
 go_dependencies += oras=oras.land/oras/cmd/oras
 go_dependencies += klone=github.com/cert-manager/klone
-go_dependencies += goreleaser=github.com/goreleaser/goreleaser
+go_dependencies += goreleaser=github.com/goreleaser/goreleaser/v2
 go_dependencies += syft=github.com/anchore/syft/cmd/syft
 go_dependencies += client-gen=k8s.io/code-generator/cmd/client-gen
 go_dependencies += deepcopy-gen=k8s.io/code-generator/cmd/deepcopy-gen