Skip to content

Commit 46f488c

Browse files
authored
build: update Proto tooling and remove old style tools module. (#765)
1 parent 393771b commit 46f488c

File tree

4 files changed

+8
-1374
lines changed

4 files changed

+8
-1374
lines changed

GNUmakefile

+8-19
Original file line numberDiff line numberDiff line change
@@ -25,23 +25,23 @@ tools: lint-tools test-tools generate-tools
2525
.PHONY: generate-tools
2626
generate-tools: ## Install the tools used to generate code
2727
@echo "==> Installing code generate tools..."
28-
cd tools && go install github.com/bufbuild/buf/cmd/buf@v0.36.0
29-
cd tools && go install github.com/golang/protobuf/protoc-gen-go@v1.4.3
28+
go install github.com/bufbuild/buf/cmd/buf@v1.27.2
29+
go install github.com/golang/protobuf/protoc-gen-go@v1.5.3
3030
@echo "==> Done"
3131

3232
.PHONY: test-tools
3333
test-tools: ## Install the tools used to run tests
3434
@echo "==> Installing test tools..."
35-
cd tools && go install gotest.tools/[email protected]
35+
go install gotest.tools/[email protected]
3636
@echo "==> Done"
3737

3838
.PHONY: lint-tools
3939
lint-tools: ## Install the tools used to lint
4040
@echo "==> Installing lint tools..."
41-
cd tools && go install github.com/golangci/golangci-lint/cmd/[email protected]
42-
cd tools && go install honnef.co/go/tools/cmd/[email protected]
43-
cd tools && go install github.com/hashicorp/go-hclog/[email protected]
44-
cd tools && go install github.com/hashicorp/hcl/v2/cmd/hclfmt@d0c4fa8b0bbc2e4eeccd1ed2a32c2089ed8c5cf1
41+
go install github.com/golangci/golangci-lint/cmd/[email protected]
42+
go install honnef.co/go/tools/cmd/[email protected]
43+
go install github.com/hashicorp/go-hclog/[email protected]
44+
go install github.com/hashicorp/hcl/v2/cmd/hclfmt@d0c4fa8b0bbc2e4eeccd1ed2a32c2089ed8c5cf1
4545
@echo "==> Done"
4646

4747
pkg/%/nomad-autoscaler: GO_OUT ?= $@
@@ -91,7 +91,7 @@ hclfmt: ## Format HCL files with hclfmt
9191
@if (git status -s | grep -q -e '\.hcl$$' -e '\.nomad$$' -e '\.tf$$'); then echo the following HCL files are out of sync; git status -s | grep -e '\.hcl$$' -e '\.nomad$$' -e '\.tf$$'; exit 1; fi
9292

9393
.PHONY: check
94-
check: tools check-sdk check-tools-mod check-root-mod check-protobuf ## Lint the source code and check other properties
94+
check: tools check-sdk check-root-mod check-protobuf ## Lint the source code and check other properties
9595

9696
.PHONY: check-sdk
9797
check-sdk: ## Checks the SDK pkg is isolated
@@ -112,17 +112,6 @@ check-root-mod: ## Checks the root Go mod is tidy
112112
exit 1; fi
113113
@echo "==> Done"
114114

115-
.PHONY: check-tools-mod
116-
check-tools-mod: ## Checks the tools Go mod is tidy
117-
@echo "==> Checking tools Go mod and Go sum..."
118-
@cd tools && go mod tidy
119-
@if (git status --porcelain | grep -Eq "go\.(mod|sum)"); then \
120-
echo tools go.mod or go.sum needs updating; \
121-
git --no-pager diff go.mod; \
122-
git --no-pager diff go.sum; \
123-
exit 1; fi
124-
@echo "==> Done"
125-
126115
.PHONY: check-protobuf
127116
check-protobuf: ## Checks the protobuf files are in-sync
128117
@$(MAKE) proto

tools/go.mod

-195
This file was deleted.

0 commit comments

Comments
 (0)