From d78fe665a727da4da8e02b7be015fcbf5aaaf92b Mon Sep 17 00:00:00 2001 From: Kurnianto Trilaksono Date: Wed, 30 Aug 2023 19:09:36 +0700 Subject: [PATCH] add commentaries, change command order on presubmit-check --- Makefile | 10 +++------- Makefile-plugins.mk | 1 + 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index e3a399bc4..d7a328ee7 100644 --- a/Makefile +++ b/Makefile @@ -108,13 +108,13 @@ verify-kustomize-repo: \ .PHONY: prow-presubmit-check prow-presubmit-check: \ install-tools \ + workspace-sync \ + generate-kustomize-builtin-plugins \ test-unit-kustomize-plugins \ test-go-mod \ build-non-plugin-all \ test-examples-kustomize-against-HEAD \ - test-examples-kustomize-against-latest-release \ - workspace-sync \ - generate-kustomize-builtin-plugins + test-examples-kustomize-against-latest-release .PHONY: license license: $(MYGOBIN)/addlicense @@ -183,10 +183,6 @@ test-examples-kustomize-against-HEAD: $(MYGOBIN)/kustomize $(MYGOBIN)/mdrip test-examples-kustomize-against-latest-release: $(MYGOBIN)/mdrip ./hack/testExamplesAgainstKustomize.sh v5@$(LATEST_RELEASE) -.PHONY: generate-kustomize-builtin-plugins -generate-kustomize-builtin-plugins: - $(MAKE) -f Makefile-plugin.mk - # Pushes dependencies in the go.work file back to go.mod files of each workspace module. .PHONY: workspace-sync workspace sync: diff --git a/Makefile-plugins.mk b/Makefile-plugins.mk index 172c70873..7b4570883 100644 --- a/Makefile-plugins.mk +++ b/Makefile-plugins.mk @@ -101,6 +101,7 @@ generate-kustomize-builtin-plugins: $(builtplugins) cd ../../../; \ make no-diff \ +# Check for diff, if diff is found, throw error code 1 (subject to change based on discussion) .PHONY: no-diff no-diff: $(builtplugins) for file in $(abspath $(builtinplugins)); do \