Skip to content

Commit

Permalink
Exclude otel(contrib|testbed)col from tidylist
Browse files Browse the repository at this point in the history
  • Loading branch information
jade-guiton-dd committed Jan 10, 2025
1 parent 6958361 commit f02ab2a
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 4 deletions.
9 changes: 7 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -115,11 +115,16 @@ stability-tests: otelcontribcol
gogci:
$(MAKE) $(FOR_GROUP_TARGET) TARGET="gci"

# `internal/tidylist/tidylist.txt` lists modules in topological order, to ensure `go mod tidy` converges.
# `make tidylist` will update this list.
# We exclude otelcontribcol and oteltestbedcol as those modules are not gitted and may not be present.
.PHONY: tidylist
tidylist: $(CROSSLINK)
$(CROSSLINK) tidylist --validate --allow-circular internal/tidylist/allow-circular.txt internal/tidylist/tidylist.txt
cd internal/tidylist && \
$(CROSSLINK) tidylist --validate --allow-circular allow-circular.txt tidylist.txt && \
sed -i.bak -E '/cmd\/otel(contrib|testbed)col/d' tidylist.txt && \
rm tidylist.txt.bak

# internal/tidylist/tidylist.txt lists modules in topological order, to ensure `go mod tidy` converges.
.PHONY: gotidy
gotidy:
@for mod in $$(cat internal/tidylist/tidylist.txt); do \
Expand Down
2 changes: 0 additions & 2 deletions internal/tidylist/tidylist.txt
Original file line number Diff line number Diff line change
Expand Up @@ -267,8 +267,6 @@ receiver/webhookeventreceiver
receiver/windowseventlogreceiver
receiver/windowsperfcountersreceiver
receiver/zookeeperreceiver
cmd/otelcontribcol
cmd/oteltestbedcol
cmd/telemetrygen
cmd/telemetrygen/internal/e2etest
confmap/provider/aesprovider
Expand Down

0 comments on commit f02ab2a

Please sign in to comment.