Skip to content

Commit 61a5337

Browse files
Merge pull request #298 from cert-manager/self-upgrade-main
[CI] Merge self-upgrade-main into main
2 parents 4676cc9 + a6a15f9 commit 61a5337

File tree

6 files changed

+20
-20
lines changed

6 files changed

+20
-20
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
##################################
3131

3232
# Some modules build their dependencies from variables, we want these to be
33-
# evalutated at the last possible moment. For this we use second expansion to
33+
# evaluated at the last possible moment. For this we use second expansion to
3434
# re-evaluate the generate and verify targets a second time.
3535
#
3636
# See https://www.gnu.org/software/make/manual/html_node/Secondary-Expansion.html

klone.yaml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -10,65 +10,65 @@ targets:
1010
- folder_name: boilerplate
1111
repo_url: https://github.com/cert-manager/makefile-modules.git
1212
repo_ref: main
13-
repo_hash: 922050ca46712a30281b318e69996da07b47d46a
13+
repo_hash: c67bc53ae3766d938701754ce7bc218145f13958
1414
repo_path: modules/boilerplate
1515
- folder_name: cert-manager
1616
repo_url: https://github.com/cert-manager/makefile-modules.git
1717
repo_ref: main
18-
repo_hash: 922050ca46712a30281b318e69996da07b47d46a
18+
repo_hash: c67bc53ae3766d938701754ce7bc218145f13958
1919
repo_path: modules/cert-manager
2020
- folder_name: controller-gen
2121
repo_url: https://github.com/cert-manager/makefile-modules.git
2222
repo_ref: main
23-
repo_hash: 922050ca46712a30281b318e69996da07b47d46a
23+
repo_hash: c67bc53ae3766d938701754ce7bc218145f13958
2424
repo_path: modules/controller-gen
2525
- folder_name: generate-verify
2626
repo_url: https://github.com/cert-manager/makefile-modules.git
2727
repo_ref: main
28-
repo_hash: 922050ca46712a30281b318e69996da07b47d46a
28+
repo_hash: c67bc53ae3766d938701754ce7bc218145f13958
2929
repo_path: modules/generate-verify
3030
- folder_name: go
3131
repo_url: https://github.com/cert-manager/makefile-modules.git
3232
repo_ref: main
33-
repo_hash: 922050ca46712a30281b318e69996da07b47d46a
33+
repo_hash: c67bc53ae3766d938701754ce7bc218145f13958
3434
repo_path: modules/go
3535
- folder_name: helm
3636
repo_url: https://github.com/cert-manager/makefile-modules.git
3737
repo_ref: main
38-
repo_hash: 922050ca46712a30281b318e69996da07b47d46a
38+
repo_hash: c67bc53ae3766d938701754ce7bc218145f13958
3939
repo_path: modules/helm
4040
- folder_name: help
4141
repo_url: https://github.com/cert-manager/makefile-modules.git
4242
repo_ref: main
43-
repo_hash: 922050ca46712a30281b318e69996da07b47d46a
43+
repo_hash: c67bc53ae3766d938701754ce7bc218145f13958
4444
repo_path: modules/help
4545
- folder_name: kind
4646
repo_url: https://github.com/cert-manager/makefile-modules.git
4747
repo_ref: main
48-
repo_hash: 922050ca46712a30281b318e69996da07b47d46a
48+
repo_hash: c67bc53ae3766d938701754ce7bc218145f13958
4949
repo_path: modules/kind
5050
- folder_name: klone
5151
repo_url: https://github.com/cert-manager/makefile-modules.git
5252
repo_ref: main
53-
repo_hash: 922050ca46712a30281b318e69996da07b47d46a
53+
repo_hash: c67bc53ae3766d938701754ce7bc218145f13958
5454
repo_path: modules/klone
5555
- folder_name: oci-build
5656
repo_url: https://github.com/cert-manager/makefile-modules.git
5757
repo_ref: main
58-
repo_hash: 922050ca46712a30281b318e69996da07b47d46a
58+
repo_hash: c67bc53ae3766d938701754ce7bc218145f13958
5959
repo_path: modules/oci-build
6060
- folder_name: oci-publish
6161
repo_url: https://github.com/cert-manager/makefile-modules.git
6262
repo_ref: main
63-
repo_hash: 922050ca46712a30281b318e69996da07b47d46a
63+
repo_hash: c67bc53ae3766d938701754ce7bc218145f13958
6464
repo_path: modules/oci-publish
6565
- folder_name: repository-base
6666
repo_url: https://github.com/cert-manager/makefile-modules.git
6767
repo_ref: main
68-
repo_hash: 922050ca46712a30281b318e69996da07b47d46a
68+
repo_hash: c67bc53ae3766d938701754ce7bc218145f13958
6969
repo_path: modules/repository-base
7070
- folder_name: tools
7171
repo_url: https://github.com/cert-manager/makefile-modules.git
7272
repo_ref: main
73-
repo_hash: 922050ca46712a30281b318e69996da07b47d46a
73+
repo_hash: c67bc53ae3766d938701754ce7bc218145f13958
7474
repo_path: modules/tools

make/_shared/generate-verify/02_mod.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
## Generate all generate targets.
1717
## @category [shared] Generate/ Verify
1818
generate: $$(shared_generate_targets)
19-
@echo "The following targets cannot be run simultaniously with each other or other generate scripts:"
19+
@echo "The following targets cannot be run simultaneously with each other or other generate scripts:"
2020
$(foreach TARGET,$(shared_generate_targets_dirty), $(MAKE) $(TARGET))
2121

2222
verify_script := $(dir $(lastword $(MAKEFILE_LIST)))/util/verify.sh

make/_shared/oci-publish/00_mod.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
# Push names is equivilent to build_names, additional names can be added for
15+
# Push names is equivalent to build_names, additional names can be added for
1616
# pushing images that are not build with the oci-build module
1717
push_names ?=
1818
push_names += $(build_names)

make/_shared/repository-base/base/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
##################################
3131

3232
# Some modules build their dependencies from variables, we want these to be
33-
# evalutated at the last possible moment. For this we use second expansion to
33+
# evaluated at the last possible moment. For this we use second expansion to
3434
# re-evaluate the generate and verify targets a second time.
3535
#
3636
# See https://www.gnu.org/software/make/manual/html_node/Secondary-Expansion.html

make/_shared/tools/00_mod.mk

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ for_each_kv = $(foreach item,$2,$(eval $(call $1,$(word 1,$(subst =, ,$(item))),
3636
# $(bin_dir)/tools, and the actual binaries are in $(bin_dir)/downloaded. When bumping
3737
# the version of the tools, this symlink gets updated.
3838

39-
# Let's have $(bin_dir)/tools in front of the PATH so that we don't inavertedly
39+
# Let's have $(bin_dir)/tools in front of the PATH so that we don't inadvertently
4040
# pick up the wrong binary somewhere. Watch out, $(shell echo $$PATH) will
4141
# still print the original PATH, since GNU make does not honor exported
4242
# variables: https://stackoverflow.com/questions/54726457
@@ -181,7 +181,7 @@ CURL := curl --silent --show-error --fail --location --retry 10 --retry-connrefu
181181

182182
# LN is expected to be an atomic action, meaning that two Make processes
183183
# can run the "link $(DOWNLOAD_DIR)/tools/xxx@$(XXX_VERSION)_$(HOST_OS)_$(HOST_ARCH)
184-
# to $(bin_dir)/tools/xxx" operation simulatiously without issues (both
184+
# to $(bin_dir)/tools/xxx" operation simultaneously without issues (both
185185
# will perform the action and the second time the link will be overwritten).
186186
LN := ln -fs
187187

@@ -579,7 +579,7 @@ $(DOWNLOAD_DIR)/tools/rclone@$(RCLONE_VERSION)_$(HOST_OS)_$(HOST_ARCH): | $(DOWN
579579
preflight_linux_amd64_SHA256SUM=97750df31f31200f073e3b2844628a0a3681a403648c76d12319f83c80666104
580580
preflight_linux_arm64_SHA256SUM=e12b2afe063c07ee75f69f285f8cc56be99b85e2abac99cbef5fb22b91ef0cb7
581581

582-
# Currently there are no offical releases for darwin, you cannot submit results
582+
# Currently there are no official releases for darwin, you cannot submit results
583583
# on non-official binaries, but we can still run tests.
584584
#
585585
# Once https://github.com/redhat-openshift-ecosystem/openshift-preflight/pull/942 is merged

0 commit comments

Comments
 (0)