Skip to content

Commit

Permalink
Merge pull request #7 from cert-manager/self-upgrade
Browse files Browse the repository at this point in the history
[CI] Merge self-upgrade into main
  • Loading branch information
jetstack-bot authored Jan 22, 2024
2 parents 3b5037d + 1c4420a commit b6aceeb
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 10 deletions.
16 changes: 8 additions & 8 deletions klone.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
5 changes: 3 additions & 2 deletions make/_shared/executable/01_mod.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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 := )
Expand Down

0 comments on commit b6aceeb

Please sign in to comment.