From c71210e44e1a90db5c67455204e965c3649050c7 Mon Sep 17 00:00:00 2001 From: jetstack-bot Date: Wed, 24 Jan 2024 14:47:42 +0000 Subject: [PATCH] BOT: run 'make upgrade-klone' and 'make generate' Signed-off-by: jetstack-bot --- klone.yaml | 16 ++++++++-------- make/_shared/executable/01_mod.mk | 6 ++---- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/klone.yaml b/klone.yaml index cdde901..227fcee 100644 --- 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: 43dfc77ac0dc7b08fbeddef87a153b40b364929b + repo_hash: 324e25c81aa398da8c3d6ee96ab87d2441dab8e5 repo_path: modules/boilerplate - folder_name: cert-manager repo_url: https://github.com/cert-manager/makefile-modules.git repo_ref: main - repo_hash: 43dfc77ac0dc7b08fbeddef87a153b40b364929b + repo_hash: 324e25c81aa398da8c3d6ee96ab87d2441dab8e5 repo_path: modules/cert-manager - folder_name: executable repo_url: https://github.com/cert-manager/makefile-modules.git repo_ref: main - repo_hash: 43dfc77ac0dc7b08fbeddef87a153b40b364929b + repo_hash: 324e25c81aa398da8c3d6ee96ab87d2441dab8e5 repo_path: modules/executable - folder_name: generate-verify repo_url: https://github.com/cert-manager/makefile-modules.git repo_ref: main - repo_hash: 43dfc77ac0dc7b08fbeddef87a153b40b364929b + repo_hash: 324e25c81aa398da8c3d6ee96ab87d2441dab8e5 repo_path: modules/generate-verify - folder_name: help repo_url: https://github.com/cert-manager/makefile-modules.git repo_ref: main - repo_hash: 43dfc77ac0dc7b08fbeddef87a153b40b364929b + repo_hash: 324e25c81aa398da8c3d6ee96ab87d2441dab8e5 repo_path: modules/help - folder_name: klone repo_url: https://github.com/cert-manager/makefile-modules.git repo_ref: main - repo_hash: 43dfc77ac0dc7b08fbeddef87a153b40b364929b + repo_hash: 324e25c81aa398da8c3d6ee96ab87d2441dab8e5 repo_path: modules/klone - folder_name: repository-base repo_url: https://github.com/cert-manager/makefile-modules.git repo_ref: main - repo_hash: 43dfc77ac0dc7b08fbeddef87a153b40b364929b + repo_hash: 324e25c81aa398da8c3d6ee96ab87d2441dab8e5 repo_path: modules/repository-base - folder_name: tools repo_url: https://github.com/cert-manager/makefile-modules.git repo_ref: main - repo_hash: 43dfc77ac0dc7b08fbeddef87a153b40b364929b + repo_hash: 324e25c81aa398da8c3d6ee96ab87d2441dab8e5 repo_path: modules/tools diff --git a/make/_shared/executable/01_mod.mk b/make/_shared/executable/01_mod.mk index 88de69a..847dc84 100644 --- a/make/_shared/executable/01_mod.mk +++ b/make/_shared/executable/01_mod.mk @@ -12,8 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -exe_operating_systems ?= darwin,linux,windows -exe_architectures ?= amd64,arm,arm64,ppc64le,s390x +exe_targets ?= darwin_amd64_v1,darwin_arm64,linux_amd64_v1,linux_arm_7,linux_arm64,linux_ppc64le,linux_s390x,windows_amd64_v1,windows_arm64 ifndef bin_dir $(error bin_dir is not set) @@ -112,8 +111,7 @@ define template_for_target $(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)")' | \ - os=$(exe_operating_systems) $(YQ) 'with(.builds[]; select(.id == "$(1)") | .goos = (env(os) | split(",")))' | \ - archs=$(exe_architectures) $(YQ) 'with(.builds[]; select(.id == "$(1)") | .goarch = (env(archs) | split(",")))' | + targets=$(exe_targets) $(YQ) 'with(.builds[]; select(.id == "$(1)") | .targets = (env(targets) | split(",")))' | endef ## Build the go source for release. This will build the source