From af3b459baeccff89e8172b8cb9f278c1b29da644 Mon Sep 17 00:00:00 2001 From: Tim Ramlot <42113979+inteon@users.noreply.github.com> Date: Wed, 29 Jan 2025 10:32:59 +0000 Subject: [PATCH] Run 'make upgrade-klone' and 'make generate' Signed-off-by: Tim Ramlot <42113979+inteon@users.noreply.github.com> --- .github/workflows/make-self-upgrade.yaml | 2 +- klone.yaml | 12 +++---- .../.github/workflows/make-self-upgrade.yaml | 2 +- make/_shared/tools/00_mod.mk | 32 ++++++++++++++----- 4 files changed, 32 insertions(+), 16 deletions(-) diff --git a/.github/workflows/make-self-upgrade.yaml b/.github/workflows/make-self-upgrade.yaml index d59b7c9701..f0ecca3b81 100644 --- a/.github/workflows/make-self-upgrade.yaml +++ b/.github/workflows/make-self-upgrade.yaml @@ -42,7 +42,7 @@ jobs: run: | make print-go-version >> "$GITHUB_OUTPUT" - - uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a # v5.2.0 + - uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0 with: go-version: ${{ steps.go-version.outputs.result }} diff --git a/klone.yaml b/klone.yaml index 6839d8a663..5154bf0e4e 100644 --- a/klone.yaml +++ b/klone.yaml @@ -10,30 +10,30 @@ targets: - folder_name: boilerplate repo_url: https://github.com/cert-manager/makefile-modules.git repo_ref: main - repo_hash: fb47cf6181d34186cb7c7ddc083afc8516d44501 + repo_hash: 99dd04f0d7ef9ade49980b5e68d5faf563a3c689 repo_path: modules/boilerplate - folder_name: generate-verify repo_url: https://github.com/cert-manager/makefile-modules.git repo_ref: main - repo_hash: fb47cf6181d34186cb7c7ddc083afc8516d44501 + repo_hash: 99dd04f0d7ef9ade49980b5e68d5faf563a3c689 repo_path: modules/generate-verify - folder_name: help repo_url: https://github.com/cert-manager/makefile-modules.git repo_ref: main - repo_hash: fb47cf6181d34186cb7c7ddc083afc8516d44501 + repo_hash: 99dd04f0d7ef9ade49980b5e68d5faf563a3c689 repo_path: modules/help - folder_name: klone repo_url: https://github.com/cert-manager/makefile-modules.git repo_ref: main - repo_hash: fb47cf6181d34186cb7c7ddc083afc8516d44501 + repo_hash: 99dd04f0d7ef9ade49980b5e68d5faf563a3c689 repo_path: modules/klone - folder_name: repository-base repo_url: https://github.com/cert-manager/makefile-modules.git repo_ref: main - repo_hash: fb47cf6181d34186cb7c7ddc083afc8516d44501 + repo_hash: 99dd04f0d7ef9ade49980b5e68d5faf563a3c689 repo_path: modules/repository-base - folder_name: tools repo_url: https://github.com/cert-manager/makefile-modules.git repo_ref: main - repo_hash: fb47cf6181d34186cb7c7ddc083afc8516d44501 + repo_hash: 99dd04f0d7ef9ade49980b5e68d5faf563a3c689 repo_path: modules/tools diff --git a/make/_shared/repository-base/base/.github/workflows/make-self-upgrade.yaml b/make/_shared/repository-base/base/.github/workflows/make-self-upgrade.yaml index d59b7c9701..f0ecca3b81 100644 --- a/make/_shared/repository-base/base/.github/workflows/make-self-upgrade.yaml +++ b/make/_shared/repository-base/base/.github/workflows/make-self-upgrade.yaml @@ -42,7 +42,7 @@ jobs: run: | make print-go-version >> "$GITHUB_OUTPUT" - - uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a # v5.2.0 + - uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0 with: go-version: ${{ steps.go-version.outputs.result }} diff --git a/make/_shared/tools/00_mod.mk b/make/_shared/tools/00_mod.mk index 4bbfe5199c..93be7c999d 100644 --- a/make/_shared/tools/00_mod.mk +++ b/make/_shared/tools/00_mod.mk @@ -161,7 +161,7 @@ ADDITIONAL_TOOLS ?= tools += $(ADDITIONAL_TOOLS) # https://go.dev/dl/ -VENDORED_GO_VERSION := 1.23.4 +VENDORED_GO_VERSION := 1.23.5 # Print the go version which can be used in GH actions .PHONY: print-go-version @@ -232,8 +232,6 @@ endef $(foreach tool,$(tools),$(eval $(call tool_defs,$(word 1,$(subst =, ,$(tool))),$(word 2,$(subst =, ,$(tool)))))) -tools_paths := $(tool_names:%=$(bin_dir)/tools/%) - ###### # Go # ###### @@ -365,7 +363,10 @@ $(call for_each_kv,go_tags_init,$(go_dependencies)) go_tags_defs = go_tags_$1 += $2 $(call for_each_kv,go_tags_defs,$(go_tags)) +go_tool_names := + define go_dependency +go_tool_names += $1 $$(DOWNLOAD_DIR)/tools/$1@$($(call uc,$1)_VERSION)_$(HOST_OS)_$(HOST_ARCH): | $$(NEEDS_GO) $$(DOWNLOAD_DIR)/tools @source $$(lock_script) $$@; \ mkdir -p $$(outfile).dir; \ @@ -379,10 +380,10 @@ $(call for_each_kv,go_dependency,$(go_dependencies)) # File downloads # ################## -go_linux_amd64_SHA256SUM=6924efde5de86fe277676e929dc9917d466efa02fb934197bc2eba35d5680971 -go_linux_arm64_SHA256SUM=16e5017863a7f6071363782b1b8042eb12c6ca4f4cd71528b2123f0a1275b13e -go_darwin_amd64_SHA256SUM=6700067389a53a1607d30aa8d6e01d198230397029faa0b109e89bc871ab5a0e -go_darwin_arm64_SHA256SUM=87d2bb0ad4fe24d2a0685a55df321e0efe4296419a9b3de03369dbe60b8acd3a +go_linux_amd64_SHA256SUM=cbcad4a6482107c7c7926df1608106c189417163428200ce357695cc7e01d091 +go_linux_arm64_SHA256SUM=47c84d332123883653b70da2db7dd57d2a865921ba4724efcdf56b5da7021db0 +go_darwin_amd64_SHA256SUM=d8b310b0b6bd6a630307579165cfac8a37571483c7d6804a10dd73bbefb0827f +go_darwin_arm64_SHA256SUM=047bfce4fbd0da6426bd30cd19716b35a466b1c15a45525ce65b9824acb33285 .PRECIOUS: $(DOWNLOAD_DIR)/tools/go@$(VENDORED_GO_VERSION)_$(HOST_OS)_$(HOST_ARCH).tar.gz $(DOWNLOAD_DIR)/tools/go@$(VENDORED_GO_VERSION)_$(HOST_OS)_$(HOST_ARCH).tar.gz: | $(DOWNLOAD_DIR)/tools @@ -642,7 +643,22 @@ ifneq ($(missing),) $(error Missing required tools: $(missing)) endif +non_go_tool_names := $(filter-out $(go_tool_names),$(tool_names)) + +.PHONY: non-go-tools +## Download and setup all Go tools +## @category [shared] Tools +non-go-tools: $(non_go_tool_names:%=$(bin_dir)/tools/%) + +.PHONY: go-tools +## Download and setup all Non-Go tools +## NOTE: this target is also used to learn the shas of +## these tools (see scripts/learn_tools_shas.sh in the +## Makefile modules repo) +## @category [shared] Tools +go-tools: $(go_tool_names:%=$(bin_dir)/tools/%) + .PHONY: tools ## Download and setup all tools ## @category [shared] Tools -tools: $(tools_paths) +tools: non-go-tools go-tools