Skip to content

OCPBUGS-44959: Makefile changes for merge-bot #340

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-bot merged 2 commits into from
Nov 25, 2024
Merged

OCPBUGS-44959: Makefile changes for merge-bot #340

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5e27724
CARRY: Makefile: add `merge-bot` target
EmilienM Nov 11, 2024
b8125ed
CARRY: Makefile: add `generate-openshift`
EmilienM Nov 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,6 +251,19 @@ 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 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.
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-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

Expand Down