Skip to content

Commit 8a370ed

Browse files
committed
split tools target into build and test tools, call build tools during release branch
1 parent 76229d9 commit 8a370ed

File tree

2 files changed

+19
-10
lines changed

2 files changed

+19
-10
lines changed

.github/workflows/release-branch.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ jobs:
228228
go install github.com/goreleaser/nfpm/v2/cmd/nfpm@${{ env.NFPM_VERSION }}
229229
sudo apt-get update
230230
sudo apt-get install -y gpgv1 monkeysphere
231-
make install-tools
231+
make install-build-tools
232232
export PATH=$PATH:~/go/bin
233233
nfpm --version
234234

Makefile.tools

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,27 @@ BENCHSTAT = golang.org/x/perf/cmd/benchstat@v0.0.0-20240404204407-f3e401e0
1010
BUF = github.com/bufbuild/buf/cmd/buf@v1.30.1
1111
PROMTAIL = github.com/prometheus/promtail/cmd/promtail@v2.10.0
1212

13-
install-tools: ## Install tool dependencies
14-
@echo "Installing Tools"
15-
16-
@$(GOINST) $(OAPICODEGEN)
17-
@$(GOINST) $(LEFTHOOK)
13+
install-test-tools: ## Install tool dependencies for testing
14+
@echo "Installing Test Tools"
1815
@$(GOINST) $(GOLANGCILINT)
19-
@$(GOINST) $(PROTOCGENGO)
2016
@$(GOINST) $(GOFUMPT)
21-
@$(GOINST) $(COUNTERFEITER)
22-
@$(GOINST) $(NFPM)
2317
@$(GOINST) $(GOTESTCOVERAGE)
2418
@$(GOINST) $(BENCHSTAT)
19+
@$(GOINST) $(COUNTERFEITER)
2520
@$(GOINST) $(BUF)
26-
@$(GOINST) $(PROMTAIL)
21+
@$(GOINST) $(LEFTHOOK)
2722
@$(GORUN) $(LEFTHOOK) install
23+
24+
install-build-tools: ## Install tool dependencies for building
25+
@echo "Installing Build Tools"
26+
@$(GOINST) $(NFPM)
27+
@$(GOINST) $(PROTOCGENGO)
28+
@$(GOINST) $(OAPICODEGEN)
29+
@$(GOINST) $(BUF)
30+
@$(GOINST) $(LEFTHOOK)
31+
@$(GORUN) $(LEFTHOOK) install
32+
33+
install-tools: ## Install tool dependencies
34+
@echo "Installing All Tools"
35+
@$(MAKE) install-build-tools
36+
@$(MAKE) install-test-tools

0 commit comments

Comments
 (0)