Skip to content
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

[chore] Make check-contrib rebuild and reapply tools #11670

Merged
merged 13 commits into from
Nov 21, 2024
Merged

[chore] Make check-contrib rebuild and reapply tools #11670

Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
95dbee0
`make check-contrib` regenerates contrib, including mdatagen and builder
jade-guiton-dd Nov 13, 2024
300b9dc
Tidy everything, not just current group (temporary)
jade-guiton-dd Nov 14, 2024
ce90143
Install mdatagen globally for go:generate
jade-guiton-dd Nov 14, 2024
75f80c9
Don't forget to build other tools too
jade-guiton-dd Nov 14, 2024
c504945
`gofmt` is actually functionally required
jade-guiton-dd Nov 14, 2024
04a3e50
Remove ocb re-run (shouldn't matter for tests)
jade-guiton-dd Nov 14, 2024
d5e4321
Remove auto-generation of `go mod edit` commands
jade-guiton-dd Nov 15, 2024
c0ee5f9
Merge branch 'main' into better-check-contrib
jade-guiton-dd Nov 15, 2024
5ff3fc7
Merge branch 'main' into better-check-contrib
jade-guiton-dd Nov 18, 2024
69a3c89
Use improved contrib Makefile
jade-guiton-dd Nov 18, 2024
992df68
Fix partial `make fmt`
jade-guiton-dd Nov 20, 2024
20325f0
Rename `regenerate-contrib` to `generate-contrib`
jade-guiton-dd Nov 20, 2024
a5fb33c
Remove generate skip check
jade-guiton-dd Nov 21, 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
17 changes: 14 additions & 3 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,19 +263,30 @@ check-contrib:
@echo Setting contrib at $(CONTRIB_PATH) to use this core checkout
@$(MAKE) -C $(CONTRIB_PATH) for-all CMD="$(GOCMD) mod edit \
$(addprefix -replace ,$(join $(ALL_MOD_PATHS:%=go.opentelemetry.io/collector%=),$(ALL_MOD_PATHS:%=$(CURDIR)%)))"
@$(MAKE) -C $(CONTRIB_PATH) gotidy
@$(MAKE) -C $(CONTRIB_PATH) for-all CMD="$(GOCMD) mod tidy"

@$(MAKE) generate-contrib

@echo -e "\nRunning tests"
@$(MAKE) -C $(CONTRIB_PATH) gotest

@if [ -z "$(SKIP_RESTORE_CONTRIB)" ]; then \
$(MAKE) restore-contrib; \
fi

.PHONY: generate-contrib
generate-contrib:
@echo -e "\nGenerating files in contrib"
$(MAKE) -C $(CONTRIB_PATH) -B install-tools
$(MAKE) -C $(CONTRIB_PATH) generate GROUP=all

# Restores contrib to its original state after running check-contrib.
.PHONY: restore-contrib
restore-contrib:
@echo Restoring contrib at $(CONTRIB_PATH) to its original state
@echo -e "\nRestoring contrib at $(CONTRIB_PATH) to its original state"
@$(MAKE) -C $(CONTRIB_PATH) for-all CMD="$(GOCMD) mod edit \
$(addprefix -dropreplace ,$(ALL_MOD_PATHS:%=go.opentelemetry.io/collector%))"
@$(MAKE) -C $(CONTRIB_PATH) -j2 gotidy
@$(MAKE) -C $(CONTRIB_PATH) for-all CMD="$(GOCMD) mod tidy"

# List of directories where certificates are stored for unit tests.
CERT_DIRS := localhost|""|config/configgrpc/testdata \
Expand Down
Loading