Merge pull request #7 from cert-manager/self-upgrade

[CI] Merge self-upgrade into main
cert-manager · Jan 22, 2024 · b6aceeb · b6aceeb
2 parents 3b5037d + 1c4420a
commit b6aceeb
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 10 deletions.
diff --git a/klone.yaml b/klone.yaml
@@ -10,40 +10,40 @@ targets:
     - folder_name: boilerplate
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 69ca8ba73402df69907d41f7f0758c0bf9a7351e
+      repo_hash: edeba4963e470a9f5e55ab1947aa15f5bdb2a2c3
       repo_path: modules/boilerplate
     - folder_name: cert-manager
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 69ca8ba73402df69907d41f7f0758c0bf9a7351e
+      repo_hash: edeba4963e470a9f5e55ab1947aa15f5bdb2a2c3
       repo_path: modules/cert-manager
     - folder_name: executable
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 69ca8ba73402df69907d41f7f0758c0bf9a7351e
+      repo_hash: edeba4963e470a9f5e55ab1947aa15f5bdb2a2c3
       repo_path: modules/executable
     - folder_name: generate-verify
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 69ca8ba73402df69907d41f7f0758c0bf9a7351e
+      repo_hash: edeba4963e470a9f5e55ab1947aa15f5bdb2a2c3
       repo_path: modules/generate-verify
     - folder_name: help
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 69ca8ba73402df69907d41f7f0758c0bf9a7351e
+      repo_hash: edeba4963e470a9f5e55ab1947aa15f5bdb2a2c3
       repo_path: modules/help
     - folder_name: klone
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 69ca8ba73402df69907d41f7f0758c0bf9a7351e
+      repo_hash: edeba4963e470a9f5e55ab1947aa15f5bdb2a2c3
       repo_path: modules/klone
     - folder_name: repository-base
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 69ca8ba73402df69907d41f7f0758c0bf9a7351e
+      repo_hash: edeba4963e470a9f5e55ab1947aa15f5bdb2a2c3
       repo_path: modules/repository-base
     - folder_name: tools
       repo_url: https://github.com/cert-manager/makefile-modules.git
       repo_ref: main
-      repo_hash: 69ca8ba73402df69907d41f7f0758c0bf9a7351e
+      repo_hash: edeba4963e470a9f5e55ab1947aa15f5bdb2a2c3
       repo_path: modules/tools
diff --git a/make/_shared/executable/01_mod.mk b/make/_shared/executable/01_mod.mk
@@ -117,14 +117,15 @@ endef
 ## for all release platforms and architectures. Additionally,
 ## this will create a checksums file, sboms and sign the binaries.
 ## @category [shared] Build
-exe-publish: | $(NEEDS_GO) $(NEEDS_GORELEASER) $(NEEDS_SYFT) $(NEEDS_YQ)
+exe-publish: | $(NEEDS_GO) $(NEEDS_GORELEASER) $(NEEDS_SYFT) $(NEEDS_YQ) $(NEEDS_COSIGN)
 	$(eval go_releaser_path := $(bin_dir)/scratch/exe-publish)
 	rm -rf $(CURDIR)/$(go_releaser_path)
 
 	cat $(gorelease_file) | \
 	$(foreach target,$(exe_build_names),$(call template_for_target,$(target))) \
 	$(YQ) '.dist = "$(CURDIR)/$(go_releaser_path)"' | \
-	$(YQ) 'with(.sboms[]; .cmd = "$(SYFT)" | .args = ["$$artifact", "--output", "spdx-json=$$document"] | .env = ["SYFT_FILE_METADATA_CATALOGER_ENABLED=true"])' \
+	$(YQ) 'with(.sboms[]; .cmd = "$(SYFT)" | .args = ["$$artifact", "--output", "spdx-json=$$document"] | .env = ["SYFT_FILE_METADATA_CATALOGER_ENABLED=true"])' | \
+	$(YQ) 'with(.signs[]; .cmd = "$(COSIGN)")' \
 	> $(CURDIR)/$(go_releaser_path).goreleaser_config.yaml
 
 	$(eval extra_args := )