Skip to content

Commit

Permalink
Don't run clean-gen twice (open-telemetry#214)
Browse files Browse the repository at this point in the history
* don't run clean-gen twice

* ignore root package from make test, as it does not include any go file
  • Loading branch information
dmathieu authored Nov 28, 2024
1 parent f83a33f commit c1b3008
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,8 @@ endif
GO := go
GO_MOD_ROOT := go.opentelemetry.io/proto
ALL_GO_MOD_DIRS := $(shell find . -type f -name 'go.mod' -exec dirname {} \; | sort)
OTEL_GO_MOD_DIRS := $(filter-out $(TOOLS_MOD_DIR), $(ALL_GO_MOD_DIRS))
ALL_GO_SUB_MOD_DIRS := $(shell find . -type f -name 'go.mod' -mindepth 2 -exec dirname {} \; | sort)
OTEL_GO_MOD_DIRS := $(filter-out $(TOOLS_MOD_DIR), $(ALL_GO_SUB_MOD_DIRS))
TIMEOUT = 60

PROTOBUF_GEN_DIR := opentelemetry-proto-gen
Expand Down Expand Up @@ -159,7 +160,8 @@ clean-gen:
rm -rf $(GEN_TEMP_DIR)

.PHONY: clean
clean: clean-gen
clean:
rm -rf $(GEN_TEMP_DIR)
rm -rf $(OTLP_OUTPUT_DIR)/*/ $(OTLPSLIM_OUTPUT_DIR)/*/

.PHONY: go-mod-tidy
Expand Down

0 comments on commit c1b3008

Please sign in to comment.