Skip to content

Commit

Permalink
Remove ocb re-run (shouldn't matter for tests)
Browse files Browse the repository at this point in the history
  • Loading branch information
jade-guiton-dd committed Nov 14, 2024
1 parent c504945 commit 04a3e50
Showing 1 changed file with 3 additions and 7 deletions.
10 changes: 3 additions & 7 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -277,15 +277,11 @@ check-contrib:

.PHONY: regenerate-contrib
regenerate-contrib:
@echo -e "\nInstalling tools into contrib"
@echo -e "\nInstalling latest mdatagen"
$(MAKE) -C $(CONTRIB_PATH) install-tools
@rm -f $(CONTRIB_PATH)/.tools/mdatagen $(CONTRIB_PATH)/.tools/builder
@pushd cmd/mdatagen && $(GOCMD) install . && popd || { echo ">> could not build mdatagen"; exit 1; }
@pushd cmd/builder && GOBIN=$(CONTRIB_PATH)/.tools $(GOCMD) install . && popd || { echo ">> could not build builder"; exit 1; }
pushd cmd/mdatagen && $(GOCMD) install . && popd || { echo ">> could not build mdatagen"; exit 1; }

@echo -e "\nRegenerating contrib"
$(MAKE) -C $(CONTRIB_PATH) genotelcontribcol
$(MAKE) -C $(CONTRIB_PATH) genoteltestbedcol
$(MAKE) -C $(CONTRIB_PATH) for-all CMD="$(GOCMD) generate ./..."
$(MAKE) -C $(CONTRIB_PATH) gofmt

Expand All @@ -296,7 +292,7 @@ restore-contrib:
$(eval MOD_PATHS := "" $(ALL_MODULES:.%=%))
@$(MAKE) -C $(CONTRIB_PATH) for-all CMD="$(GOCMD) mod edit \
$(addprefix -dropreplace ,$(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

0 comments on commit 04a3e50

Please sign in to comment.