github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-10 04:27:54 +00:00
Code Issues Projects Releases Wiki Activity

Get rid of verify_generated_files

Browse Source 
It doesn't work right, we autogenerate on-demand, and we want to stop
checking them in.
This commit is contained in:
Tim Hockin 2018-04-29 18:27:27 +01:00
parent 1d10287d75
commit cb1332db06
2 changed files with 2 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
build/root/Makefile
View File

@ -124,7 +124,7 @@ ifeq ($(PRINT_HELP),y)
verify: verify:
@echo "$$VERIFY_HELP_INFO" @echo "$$VERIFY_HELP_INFO"
else else
verify: verify_generated_files verify:
KUBE_VERIFY_GIT_BRANCH=$(BRANCH) hack/make-rules/verify.sh KUBE_VERIFY_GIT_BRANCH=$(BRANCH) hack/make-rules/verify.sh
endif endif
@ -139,7 +139,7 @@ ifeq ($(PRINT_HELP),y)
quick-verify: quick-verify:
@echo "$$QUICK_VERIFY_HELP_INFO" @echo "$$QUICK_VERIFY_HELP_INFO"
else else
quick-verify: verify_generated_files quick-verify:
QUICK=true SILENT=false hack/make-rules/verify.sh QUICK=true SILENT=false hack/make-rules/verify.sh
endif endif
@ -483,21 +483,6 @@ generated_files:
$(MAKE) -f Makefile.generated_files $@ CALLED_FROM_MAIN_MAKEFILE=1 $(MAKE) -f Makefile.generated_files $@ CALLED_FROM_MAIN_MAKEFILE=1
endif endif
define VERIFY_GENERATED_FILES_HELP_INFO
# Verify auto-generated files needed for the build.
#
# Example:
# make verify_generated_files
endef
.PHONY: verify_generated_files
ifeq ($(PRINT_HELP),y)
verify_generated_files:
@echo "$$VERIFY_GENERATED_FILES_HELP_INFO"
else
verify_generated_files:
$(MAKE) -f Makefile.generated_files $@ CALLED_FROM_MAIN_MAKEFILE=1
endif
define HELP_INFO define HELP_INFO
# Print make targets and help info # Print make targets and help info
# #

17
build/root/Makefile.generated_files
View File

@ -37,11 +37,6 @@ SHELL := /bin/bash
.PHONY: generated_files .PHONY: generated_files
generated_files: gen_deepcopy gen_defaulter gen_conversion gen_openapi gen_bindata generated_files: gen_deepcopy gen_defaulter gen_conversion gen_openapi gen_bindata
.PHONY: verify_generated_files
verify_generated_files: verify_gen_deepcopy \
verify_gen_defaulter \
verify_gen_conversion
# Code-generation logic. # Code-generation logic.
# #
# This stuff can be pretty tricky, and there's probably some corner cases that # This stuff can be pretty tricky, and there's probably some corner cases that
@ -245,10 +240,6 @@ RUN_GEN_DEEPCOPY = \
gen_deepcopy: $(DEEPCOPY_FILES) $(DEEPCOPY_GEN) gen_deepcopy: $(DEEPCOPY_FILES) $(DEEPCOPY_GEN)
$(RUN_GEN_DEEPCOPY) $(RUN_GEN_DEEPCOPY)
.PHONY: verify_gen_deepcopy
verify_gen_deepcopy: $(DEEPCOPY_GEN)
$(RUN_GEN_DEEPCOPY) --verify-only
# For each dir in DEEPCOPY_DIRS, this establishes a dependency between the # For each dir in DEEPCOPY_DIRS, this establishes a dependency between the
# output file and the input files that should trigger a rebuild. # output file and the input files that should trigger a rebuild.
# #
@ -383,10 +374,6 @@ RUN_GEN_DEFAULTER := \
gen_defaulter: $(DEFAULTER_FILES) $(DEFAULTER_GEN) gen_defaulter: $(DEFAULTER_FILES) $(DEFAULTER_GEN)
$(RUN_GEN_DEFAULTER) $(RUN_GEN_DEFAULTER)
.PHONY: verify_gen_deepcopy
verify_gen_defaulter: $(DEFAULTER_GEN)
$(RUN_GEN_DEFAULTER) --verify-only
# For each dir in DEFAULTER_DIRS, this establishes a dependency between the # For each dir in DEFAULTER_DIRS, this establishes a dependency between the
# output file and the input files that should trigger a rebuild. # output file and the input files that should trigger a rebuild.
# #
@ -551,10 +538,6 @@ RUN_GEN_CONVERSION = \
gen_conversion: $(CONVERSION_FILES) $(CONVERSION_GEN) gen_conversion: $(CONVERSION_FILES) $(CONVERSION_GEN)
$(RUN_GEN_CONVERSION) $(RUN_GEN_CONVERSION)
.PHONY: verify_gen_conversion
verify_gen_conversion: $(CONVERSION_GEN)
$(RUN_GEN_CONVERSION) --verify-only
# Establish a dependency between the deps file and the dir. Whenever a dir # Establish a dependency between the deps file and the dir. Whenever a dir
# changes (files added or removed) the deps file will be considered stale. # changes (files added or removed) the deps file will be considered stale.
# #