Skip to content

Commit c1a39a1

Browse files
committed
CARRY: Makefile: add generate-openshift
We need this target so merge-bot target can run it.
1 parent b5eb2e8 commit c1a39a1

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed

Makefile

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@ modules: ## Runs go mod to ensure proper vendoring.
279279
cd $(REPO_ROOT)/hack/codegen; go work sync; go mod tidy
280280

281281
.PHONY: merge-bot
282-
merge-bot: full-vendoring generate ## Runs targets that help merge-bot to rebase downstream CAPO.
282+
merge-bot: full-vendoring generate generate-openshift ## Runs targets that help merge-bot to rebase downstream CAPO.
283283

284284
.PHONY: full-vendoring
285285
full-vendoring: ## Runs commands that complete vendoring tasks for downstream CAPO.
@@ -290,6 +290,10 @@ full-vendoring: ## Runs commands that complete vendoring tasks for downstream CA
290290
cd $(REPO_ROOT)/orc; go mod tidy; go mod vendor
291291
cd $(REPO_ROOT)/orc/hack/codegen; go work sync; go mod tidy; go work vendor
292292

293+
.PHONY: generate-openshift
294+
generate-openshift:
295+
$(MAKE) -C $(REPO_ROOT)/openshift generate
296+
293297
.PHONY: generate
294298
generate: templates generate-orc generate-controller-gen generate-codegen generate-conversion-gen generate-go generate-manifests generate-api-docs ## Generate all generated code
295299

hack/tools/vendor/sigs.k8s.io/cluster-api-provider-openstack/Makefile

Lines changed: 5 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)