Skip to content

Commit

Permalink
BOT: run 'make upgrade-klone' and 'make generate'
Browse files Browse the repository at this point in the history
Signed-off-by: cert-manager-bot <[email protected]>
  • Loading branch information
cert-manager-bot committed Aug 30, 2024
1 parent 5299519 commit 63387e5
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 20 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
##################################

# Some modules build their dependencies from variables, we want these to be
# evalutated at the last possible moment. For this we use second expansion to
# evaluated at the last possible moment. For this we use second expansion to
# re-evaluate the generate and verify targets a second time.
#
# See https://www.gnu.org/software/make/manual/html_node/Secondary-Expansion.html
Expand Down
26 changes: 13 additions & 13 deletions klone.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,65 +10,65 @@ targets:
- folder_name: boilerplate
repo_url: https://github.com/cert-manager/makefile-modules.git
repo_ref: main
repo_hash: 922050ca46712a30281b318e69996da07b47d46a
repo_hash: c67bc53ae3766d938701754ce7bc218145f13958
repo_path: modules/boilerplate
- folder_name: cert-manager
repo_url: https://github.com/cert-manager/makefile-modules.git
repo_ref: main
repo_hash: 922050ca46712a30281b318e69996da07b47d46a
repo_hash: c67bc53ae3766d938701754ce7bc218145f13958
repo_path: modules/cert-manager
- folder_name: controller-gen
repo_url: https://github.com/cert-manager/makefile-modules.git
repo_ref: main
repo_hash: 922050ca46712a30281b318e69996da07b47d46a
repo_hash: c67bc53ae3766d938701754ce7bc218145f13958
repo_path: modules/controller-gen
- folder_name: generate-verify
repo_url: https://github.com/cert-manager/makefile-modules.git
repo_ref: main
repo_hash: 922050ca46712a30281b318e69996da07b47d46a
repo_hash: c67bc53ae3766d938701754ce7bc218145f13958
repo_path: modules/generate-verify
- folder_name: go
repo_url: https://github.com/cert-manager/makefile-modules.git
repo_ref: main
repo_hash: 922050ca46712a30281b318e69996da07b47d46a
repo_hash: c67bc53ae3766d938701754ce7bc218145f13958
repo_path: modules/go
- folder_name: helm
repo_url: https://github.com/cert-manager/makefile-modules.git
repo_ref: main
repo_hash: 922050ca46712a30281b318e69996da07b47d46a
repo_hash: c67bc53ae3766d938701754ce7bc218145f13958
repo_path: modules/helm
- folder_name: help
repo_url: https://github.com/cert-manager/makefile-modules.git
repo_ref: main
repo_hash: 922050ca46712a30281b318e69996da07b47d46a
repo_hash: c67bc53ae3766d938701754ce7bc218145f13958
repo_path: modules/help
- folder_name: kind
repo_url: https://github.com/cert-manager/makefile-modules.git
repo_ref: main
repo_hash: 922050ca46712a30281b318e69996da07b47d46a
repo_hash: c67bc53ae3766d938701754ce7bc218145f13958
repo_path: modules/kind
- folder_name: klone
repo_url: https://github.com/cert-manager/makefile-modules.git
repo_ref: main
repo_hash: 922050ca46712a30281b318e69996da07b47d46a
repo_hash: c67bc53ae3766d938701754ce7bc218145f13958
repo_path: modules/klone
- folder_name: oci-build
repo_url: https://github.com/cert-manager/makefile-modules.git
repo_ref: main
repo_hash: 922050ca46712a30281b318e69996da07b47d46a
repo_hash: c67bc53ae3766d938701754ce7bc218145f13958
repo_path: modules/oci-build
- folder_name: oci-publish
repo_url: https://github.com/cert-manager/makefile-modules.git
repo_ref: main
repo_hash: 922050ca46712a30281b318e69996da07b47d46a
repo_hash: c67bc53ae3766d938701754ce7bc218145f13958
repo_path: modules/oci-publish
- folder_name: repository-base
repo_url: https://github.com/cert-manager/makefile-modules.git
repo_ref: main
repo_hash: 922050ca46712a30281b318e69996da07b47d46a
repo_hash: c67bc53ae3766d938701754ce7bc218145f13958
repo_path: modules/repository-base
- folder_name: tools
repo_url: https://github.com/cert-manager/makefile-modules.git
repo_ref: main
repo_hash: 922050ca46712a30281b318e69996da07b47d46a
repo_hash: c67bc53ae3766d938701754ce7bc218145f13958
repo_path: modules/tools
2 changes: 1 addition & 1 deletion make/_shared/generate-verify/02_mod.mk
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
## Generate all generate targets.
## @category [shared] Generate/ Verify
generate: $$(shared_generate_targets)
@echo "The following targets cannot be run simultaniously with each other or other generate scripts:"
@echo "The following targets cannot be run simultaneously with each other or other generate scripts:"
$(foreach TARGET,$(shared_generate_targets_dirty), $(MAKE) $(TARGET))

verify_script := $(dir $(lastword $(MAKEFILE_LIST)))/util/verify.sh
Expand Down
2 changes: 1 addition & 1 deletion make/_shared/oci-publish/00_mod.mk
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

# Push names is equivilent to build_names, additional names can be added for
# Push names is equivalent to build_names, additional names can be added for
# pushing images that are not build with the oci-build module
push_names ?=
push_names += $(build_names)
Expand Down
2 changes: 1 addition & 1 deletion make/_shared/repository-base/base/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
##################################

# Some modules build their dependencies from variables, we want these to be
# evalutated at the last possible moment. For this we use second expansion to
# evaluated at the last possible moment. For this we use second expansion to
# re-evaluate the generate and verify targets a second time.
#
# See https://www.gnu.org/software/make/manual/html_node/Secondary-Expansion.html
Expand Down
6 changes: 3 additions & 3 deletions make/_shared/tools/00_mod.mk
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ for_each_kv = $(foreach item,$2,$(eval $(call $1,$(word 1,$(subst =, ,$(item))),
# $(bin_dir)/tools, and the actual binaries are in $(bin_dir)/downloaded. When bumping
# the version of the tools, this symlink gets updated.

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

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

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

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

0 comments on commit 63387e5

Please sign in to comment.