Merge pull request #2186 from sbueringer/pr-verify-gen-modules

🌱 verify.sh: verify generate & modules (in CI)

Author: k8s-ci-robot

Makefile

@@ -117,7 +117,15 @@ clean-bin: ## Remove all generated binaries.
 	rm -rf hack/tools/bin
 
 .PHONY: verify-modules
-verify-modules: modules
-	@if !(git diff --quiet HEAD -- go.sum go.mod); then \
+verify-modules: modules ## Verify go modules are up to date
+	@if !(git diff --quiet HEAD -- go.sum go.mod $(TOOLS_DIR)/go.mod $(TOOLS_DIR)/go.sum $(ENVTEST_DIR)/go.mod $(ENVTEST_DIR)/go.sum); then \
+		git diff; \
 		echo "go module files are out of date, please run 'make modules'"; exit 1; \
 	fi
+
+.PHONY: verify-generate
+verify-generate: generate ## Verify generated files are up to date
+	@if !(git diff --quiet HEAD); then \
+		git diff; \
+		echo "generated files are out of date, run make generate"; exit 1; \
+	fi

hack/verify.sh

@@ -24,12 +24,22 @@ cd "${REPO_ROOT}"
 header_text "running generate"
 make generate
 
-header_text "running golangci-lint"
-make lint
+# Only run verify-generate in CI, otherwise running generate
+# locally (which is a valid operation) causes `make test` to fail.
+if [[ -n ${CI} ]]; then
+    header_text "verifying generate"
+    make verify-generate
+fi
 
-# Only run module verification in CI, otherwise updating
+header_text "running modules"
+make modules
+
+# Only run verify-modules in CI, otherwise updating
 # go module locally (which is a valid operation) causes `make test` to fail.
 if [[ -n ${CI} ]]; then
     header_text "verifying modules"
-    make modules verify-modules
+    make verify-modules
 fi
+
+header_text "running golangci-lint"
+make lint