From 5e277243dc2dffd603479eed706e6a54997373ec Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Mon, 11 Nov 2024 11:24:25 -0500 Subject: [PATCH 1/2] CARRY: Makefile: add `merge-bot` target (cherry picked from commit 99c8ad6587fa1c310ea21be9030c70321d089685) --- Makefile | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Makefile b/Makefile index 064ae4d0c6..6440036cc2 100644 --- a/Makefile +++ b/Makefile @@ -251,6 +251,15 @@ modules: ## Runs go mod to ensure proper vendoring. go mod tidy cd $(TOOLS_DIR); go mod tidy +.PHONY: merge-bot +merge-bot: full-vendoring generate ## Runs targets that help merge-bot to rebase downstream CAPO. + +.PHONY: full-vendoring +full-vendoring: ## Runs commands that complete vendoring tasks for downstream CAPO. + go mod tidy && go mod vendor + cd $(TOOLS_DIR); go mod tidy; go mod vendor + cd $(REPO_ROOT)/openshift; go mod tidy; go mod vendor + .PHONY: generate generate: templates generate-controller-gen generate-conversion-gen generate-go generate-manifests generate-api-docs ## Generate all generated code From b8125ed968d8fbfff8479147978cf8e835e82431 Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Tue, 12 Nov 2024 10:45:00 -0500 Subject: [PATCH 2/2] CARRY: Makefile: add `generate-openshift` We need this target so merge-bot target can run it. (cherry picked from commit c1a39a1b640b9401197435951707ad89e369c9c8) --- Makefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 6440036cc2..4c040c5ea9 100644 --- a/Makefile +++ b/Makefile @@ -252,7 +252,7 @@ modules: ## Runs go mod to ensure proper vendoring. cd $(TOOLS_DIR); go mod tidy .PHONY: merge-bot -merge-bot: full-vendoring generate ## Runs targets that help merge-bot to rebase downstream CAPO. +merge-bot: full-vendoring generate generate-openshift ## Runs targets that help merge-bot to rebase downstream CAPO. .PHONY: full-vendoring full-vendoring: ## Runs commands that complete vendoring tasks for downstream CAPO. @@ -260,6 +260,10 @@ full-vendoring: ## Runs commands that complete vendoring tasks for downstream CA cd $(TOOLS_DIR); go mod tidy; go mod vendor cd $(REPO_ROOT)/openshift; go mod tidy; go mod vendor +.PHONY: generate-openshift +generate-openshift: + $(MAKE) -C $(REPO_ROOT)/openshift generate + .PHONY: generate generate: templates generate-controller-gen generate-conversion-gen generate-go generate-manifests generate-api-docs ## Generate all generated code