Skip to content

Commit 48822d8

Browse files
cert-manager-prow[bot]cert-manager-prow[bot]
authored
Merge pull request #1635 from cert-manager/self-upgrade-master
[CI] Merge self-upgrade-master into master
2 parents 5f65836 + d3a07ee commit 48822d8

File tree

5 files changed

+25
-25
lines changed

5 files changed

+25
-25
lines changed

‎.github/workflows/make-self-upgrade.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
run: |
4343
make print-go-version >> "$GITHUB_OUTPUT"
4444
45-
- uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0
45+
- uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5.4.0
4646
with:
4747
go-version: ${{ steps.go-version.outputs.result }}
4848

‎klone.yaml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,30 +10,30 @@ targets:
1010
- folder_name: boilerplate
1111
repo_url: https://github.com/cert-manager/makefile-modules.git
1212
repo_ref: main
13-
repo_hash: 398badf7250460bd04537b1132e747ea9d4c69ed
13+
repo_hash: 891f9286a567b3a0cfd85469d3aceddf99a887be
1414
repo_path: modules/boilerplate
1515
- folder_name: generate-verify
1616
repo_url: https://github.com/cert-manager/makefile-modules.git
1717
repo_ref: main
18-
repo_hash: 398badf7250460bd04537b1132e747ea9d4c69ed
18+
repo_hash: 891f9286a567b3a0cfd85469d3aceddf99a887be
1919
repo_path: modules/generate-verify
2020
- folder_name: help
2121
repo_url: https://github.com/cert-manager/makefile-modules.git
2222
repo_ref: main
23-
repo_hash: 398badf7250460bd04537b1132e747ea9d4c69ed
23+
repo_hash: 891f9286a567b3a0cfd85469d3aceddf99a887be
2424
repo_path: modules/help
2525
- folder_name: klone
2626
repo_url: https://github.com/cert-manager/makefile-modules.git
2727
repo_ref: main
28-
repo_hash: 398badf7250460bd04537b1132e747ea9d4c69ed
28+
repo_hash: 891f9286a567b3a0cfd85469d3aceddf99a887be
2929
repo_path: modules/klone
3030
- folder_name: repository-base
3131
repo_url: https://github.com/cert-manager/makefile-modules.git
3232
repo_ref: main
33-
repo_hash: 398badf7250460bd04537b1132e747ea9d4c69ed
33+
repo_hash: 891f9286a567b3a0cfd85469d3aceddf99a887be
3434
repo_path: modules/repository-base
3535
- folder_name: tools
3636
repo_url: https://github.com/cert-manager/makefile-modules.git
3737
repo_ref: main
38-
repo_hash: 398badf7250460bd04537b1132e747ea9d4c69ed
38+
repo_hash: 891f9286a567b3a0cfd85469d3aceddf99a887be
3939
repo_path: modules/tools

‎make/_shared/repository-base/base/.github/workflows/make-self-upgrade.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
run: |
4343
make print-go-version >> "$GITHUB_OUTPUT"
4444
45-
- uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0
45+
- uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b # v5.4.0
4646
with:
4747
go-version: ${{ steps.go-version.outputs.result }}
4848

‎make/_shared/tools/00_mod.mk‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ endif
2121
export DOWNLOAD_DIR ?= $(CURDIR)/$(bin_dir)/downloaded
2222
export GOVENDOR_DIR ?= $(CURDIR)/$(bin_dir)/go_vendor
2323

24-
$(bin_dir)/scratch/image $(bin_dir)/tools $(DOWNLOAD_DIR)/tools:
24+
$(bin_dir)/tools $(DOWNLOAD_DIR)/tools:
2525
@mkdir -p $@
2626

2727
checkhash_script := $(dir $(lastword $(MAKEFILE_LIST)))/util/checkhash.sh
@@ -66,7 +66,7 @@ tools += kyverno=v1.12.5
6666
# https://github.com/mikefarah/yq/releases
6767
tools += yq=v4.44.3
6868
# https://github.com/ko-build/ko/releases
69-
tools += ko=0.16.0
69+
tools += ko=0.17.1
7070
# https://github.com/protocolbuffers/protobuf/releases
7171
tools += protoc=27.3
7272
# https://github.com/aquasecurity/trivy/releases
@@ -111,7 +111,7 @@ tools += oras=v1.2.0
111111
detected_ginkgo_version := $(shell [[ -f go.mod ]] && awk '/ginkgo\/v2/ {print $$2}' go.mod || echo "v2.13.2")
112112
tools += ginkgo=$(detected_ginkgo_version)
113113
# https://pkg.go.dev/github.com/cert-manager/klone?tab=versions
114-
tools += klone=v0.1.0
114+
tools += klone=v0.2.0
115115
# https://pkg.go.dev/github.com/goreleaser/goreleaser?tab=versions
116116
tools += goreleaser=v1.26.2
117117
# https://pkg.go.dev/github.com/anchore/syft/cmd/syft?tab=versions. We are still
@@ -132,8 +132,8 @@ tools += govulncheck=v1.1.3
132132
tools += operator-sdk=v1.38.0
133133
# https://pkg.go.dev/github.com/cli/cli/v2?tab=versions
134134
tools += gh=v2.63.1
135-
# https:///github.com/redhat-openshift-ecosystem/openshift-preflight/releases
136-
tools += preflight=1.11.1
135+
# https://github.com/redhat-openshift-ecosystem/openshift-preflight/releases
136+
tools += preflight=1.12.0
137137
# https://github.com/daixiang0/gci/releases
138138
tools += gci=v0.13.5
139139
# https://github.com/google/yamlfmt/releases
@@ -161,7 +161,7 @@ ADDITIONAL_TOOLS ?=
161161
tools += $(ADDITIONAL_TOOLS)
162162

163163
# https://go.dev/dl/
164-
VENDORED_GO_VERSION := 1.23.5
164+
VENDORED_GO_VERSION := 1.23.8
165165

166166
# Print the go version which can be used in GH actions
167167
.PHONY: print-go-version
@@ -380,10 +380,10 @@ $(call for_each_kv,go_dependency,$(go_dependencies))
380380
# File downloads #
381381
##################
382382

383-
go_linux_amd64_SHA256SUM=cbcad4a6482107c7c7926df1608106c189417163428200ce357695cc7e01d091
384-
go_linux_arm64_SHA256SUM=47c84d332123883653b70da2db7dd57d2a865921ba4724efcdf56b5da7021db0
385-
go_darwin_amd64_SHA256SUM=d8b310b0b6bd6a630307579165cfac8a37571483c7d6804a10dd73bbefb0827f
386-
go_darwin_arm64_SHA256SUM=047bfce4fbd0da6426bd30cd19716b35a466b1c15a45525ce65b9824acb33285
383+
go_linux_amd64_SHA256SUM=45b87381172a58d62c977f27c4683c8681ef36580abecd14fd124d24ca306d3f
384+
go_linux_arm64_SHA256SUM=9d6d938422724a954832d6f806d397cf85ccfde8c581c201673e50e634fdc992
385+
go_darwin_amd64_SHA256SUM=4a0f0a5eb539013c1f4d989e0864aed45973c0a9d4b655ff9fd56013e74c1303
386+
go_darwin_arm64_SHA256SUM=d4f53dcaecd67d9d2926eab7c3d674030111c2491e68025848f6839e04a4d3d1
387387

388388
.PRECIOUS: $(DOWNLOAD_DIR)/tools/go@$(VENDORED_GO_VERSION)_$(HOST_OS)_$(HOST_ARCH).tar.gz
389389
$(DOWNLOAD_DIR)/tools/go@$(VENDORED_GO_VERSION)_$(HOST_OS)_$(HOST_ARCH).tar.gz: | $(DOWNLOAD_DIR)/tools
@@ -503,10 +503,10 @@ $(DOWNLOAD_DIR)/tools/yq@$(YQ_VERSION)_$(HOST_OS)_$(HOST_ARCH): | $(DOWNLOAD_DIR
503503
$(checkhash_script) $(outfile) $(yq_$(HOST_OS)_$(HOST_ARCH)_SHA256SUM); \
504504
chmod +x $(outfile)
505505

506-
ko_linux_amd64_SHA256SUM=aee2caeced511e60c6889a4cfaf9ebe28ec35acb49531b7a90b09e0a963bcff7
507-
ko_linux_arm64_SHA256SUM=45b6ba20084b2199c63dcc738c54f7f6c37ea4e9c7f79eefc286d9947b11d0d1
508-
ko_darwin_amd64_SHA256SUM=5c98d0229fd2a82cc69510705b74a7196fc184641693930b0f9282b6d1f79d95
509-
ko_darwin_arm64_SHA256SUM=9c75b97f26ba98c62a86f3b39e2c74ced6c97092f301cd73fe4e5b3e16261698
506+
ko_linux_amd64_SHA256SUM=4f0b979b59880b3232f47d79c940f2279165aaad15a11d7614e8a2c9e5c78c29
507+
ko_linux_arm64_SHA256SUM=9421ebe2a611bac846844bd34fed5c75fba7b36c8cb1d113ad8680c48f6106df
508+
ko_darwin_amd64_SHA256SUM=888656c3f0028d4211654a9df57b003fe26f874b092776c83acace7aca8a73a4
509+
ko_darwin_arm64_SHA256SUM=d0b6bcc4f86c8d775688d1c21d416985ee557a85ad557c4a7d0e2d82b7cdbd92
510510

511511
.PRECIOUS: $(DOWNLOAD_DIR)/tools/ko@$(KO_VERSION)_$(HOST_OS)_$(HOST_ARCH)
512512
$(DOWNLOAD_DIR)/tools/ko@$(KO_VERSION)_$(HOST_OS)_$(HOST_ARCH): | $(DOWNLOAD_DIR)/tools
@@ -598,8 +598,8 @@ $(DOWNLOAD_DIR)/tools/istioctl@$(ISTIOCTL_VERSION)_$(HOST_OS)_$(HOST_ARCH): | $(
598598
chmod +x $(outfile); \
599599
rm $(outfile).tar.gz
600600

601-
preflight_linux_amd64_SHA256SUM=ec4abfa6afd8952027cf15a4b05b80317edb18572184c33018769d6f39443af5
602-
preflight_linux_arm64_SHA256SUM=07e10e30b824ee14b57925315fbe0fa6df90e84a1c3df1fd15546cc14382b135
601+
preflight_linux_amd64_SHA256SUM=0cdad38aff54242f2dd531f520e9393485a5931cd8f9fc9ebd8a23a53c2bf199
602+
preflight_linux_arm64_SHA256SUM=9d814ff81b94b070c6ff6941fb124d4dab9efd2f37e083c10012540db4e6a60c
603603

604604
# Currently there are no official releases for darwin, you cannot submit results
605605
# on non-official binaries, but we can still run tests.

‎make/_shared/tools/util/lock.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ set -o pipefail
2929
finalfile="$1"
3030
lockfile="$finalfile.lock"
3131

32-
# On OSX, flock is not installed, we just skip locking in that case,
32+
# On macOS, flock is not installed, we just skip locking in that case,
3333
# this means that running verify in parallel without downloading all
3434
# tools first will not work.
3535
flock_installed=$(command -v flock >/dev/null && echo "yes" || echo "no")

0 commit comments

Comments
 (0)