From f22a85bcbbd43444df3d2f0bc9137fec3cd0f528 Mon Sep 17 00:00:00 2001 From: Steve Kuznetsov Date: Tue, 15 Aug 2023 09:19:43 -0600 Subject: [PATCH] scripts,Make: add a generate-manifests target Signed-off-by: Steve Kuznetsov --- Makefile | 7 +++++-- scripts/bumper/main.go | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index f2e909bb7b..f47aae108d 100644 --- a/Makefile +++ b/Makefile @@ -139,6 +139,10 @@ vendor: manifests: ## Generate manifests OLM_VERSION=$(OLM_VERSION) ./scripts/generate_crds_manifests.sh +.PHONY: generate-manifests +generate-manifests: OLM_VERSION=0.0.1-snapshot +generate-manifests: manifests + .PHONY: diff diff: git diff --stat HEAD --ignore-submodules --exit-code @@ -146,8 +150,7 @@ diff: verify-vendor: vendor $(MAKE) diff -verify-manifests: OLM_VERSION=0.0.1-snapshot -verify-manifests: manifests +verify-manifests: generate-manifests $(MAKE) diff verify-nested-vendor: diff --git a/scripts/bumper/main.go b/scripts/bumper/main.go index 9112e4a56e..a1442f5154 100644 --- a/scripts/bumper/main.go +++ b/scripts/bumper/main.go @@ -277,7 +277,7 @@ func cherryPick(ctx context.Context, logger *logrus.Entry, c commit) error { "go", "mod", "verify", ), os.Environ()...), withEnv(exec.CommandContext(ctx, - "make", "manifests", "OLM_VERSION=0.0.1-snapshot", + "make", "generate-manifests", ), os.Environ()...), exec.CommandContext(ctx, "git", "add",