Skip to content

Commit 2a87d84

Browse files
authored
chore: Makefile cleanup go.mod tidying (#2900)
This uses a wildcard target to cleanup subsequent go.mods
1 parent 318f600 commit 2a87d84

File tree

1 file changed

+12
-9
lines changed

1 file changed

+12
-9
lines changed

Makefile

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,9 @@ EMBEDASSETS ?= embedassets
3131
VPREFIX := github.com/grafana/pyroscope/pkg/util/build
3232
GO_LDFLAGS := -X $(VPREFIX).Branch=$(GIT_BRANCH) -X $(VPREFIX).Version=$(IMAGE_TAG) -X $(VPREFIX).Revision=$(GIT_REVISION) -X $(VPREFIX).BuildDate=$(GIT_LAST_COMMIT_DATE)
3333

34+
# Folders with go.mod file
35+
GO_MOD_PATHS := api/ ebpf/ examples/golang-push/rideshare/ examples/golang-push/simple/
36+
3437
# Add extra arguments to helm commands
3538
HELM_ARGS =
3639

@@ -129,20 +132,20 @@ go/lint: $(BIN)/golangci-lint
129132
$(GO) vet ./...
130133

131134
.PHONY: go/mod
132-
go/mod:
135+
go/mod: $(foreach P,$(GO_MOD_PATHS),go/mod_tidy/$P)
136+
137+
.PHONY: go/mod_tidy_root
138+
go/mod_tidy_root:
133139
GO111MODULE=on go mod download
134140
# doesn't work for go workspace
135141
# GO111MODULE=on go mod verify
136142
go work sync
137143
GO111MODULE=on go mod tidy
138-
cd api/ && GO111MODULE=on go mod download
139-
cd api/ && GO111MODULE=on go mod tidy
140-
cd ebpf/ && GO111MODULE=on go mod download
141-
cd ebpf/ && GO111MODULE=on go mod tidy
142-
cd examples/golang-push/rideshare/ && GO111MODULE=on go mod download
143-
cd examples/golang-push/rideshare/ && GO111MODULE=on go mod tidy
144-
cd examples/golang-push/simple/ && GO111MODULE=on go mod download
145-
cd examples/golang-push/simple/ && GO111MODULE=on go mod tidy
144+
145+
.PHONY: go/mod_tidy/%
146+
go/mod_tidy/%: go/mod_tidy_root
147+
cd "$*" && GO111MODULE=on go mod download
148+
cd "$*" && GO111MODULE=on go mod tidy
146149

147150
.PHONY: fmt
148151
fmt: $(BIN)/golangci-lint $(BIN)/buf $(BIN)/tk ## Automatically fix some lint errors

0 commit comments

Comments
 (0)