Skip to content

Commit

Permalink
[chore] disable generate for now (#11794)
Browse files Browse the repository at this point in the history
This is a partial revert of
#11670 as
it is currently blocking the release due to the need to run go mod tidy
multiple times.

I'm still investigating why tidy is needed multiple times, but for now
I'm disabling the generate step, which was not run before and is
currently blocking the release process

Signed-off-by: Alex Boten <[email protected]>
  • Loading branch information
codeboten authored Dec 3, 2024
1 parent 178729c commit 311ab57
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -261,11 +261,9 @@ ALL_MOD_PATHS := "" $(ALL_MODULES:.%=%)
.PHONY: check-contrib
check-contrib:
@echo Setting contrib at $(CONTRIB_PATH) to use this core checkout
@$(MAKE) -C $(CONTRIB_PATH) for-all CMD="$(GOCMD) mod edit \
@$(MAKE) -j2 -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) for-all CMD="$(GOCMD) mod tidy"

@$(MAKE) generate-contrib
@$(MAKE) -j2 -C $(CONTRIB_PATH) gotidy

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

0 comments on commit 311ab57

Please sign in to comment.