Skip to content

Commit 509d84f

Browse files
committed
use go tool instead of tools.go
1 parent cecc39f commit 509d84f

File tree

9 files changed

+851
-696
lines changed

9 files changed

+851
-696
lines changed

.github/workflows/build.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@ jobs:
2525

2626
- uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0
2727
with:
28-
go-version: '1.23'
28+
go-version: '1.24'
29+
check-latest: true
2930

3031
- name: Build
3132
run: make ci

.github/workflows/codeql.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@ jobs:
3636

3737
- uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0
3838
with:
39-
go-version: '1.23'
39+
go-version: '1.24'
40+
check-latest: true
4041

4142
# Initializes the CodeQL tools for scanning.
4243
- name: Initialize CodeQL

.github/workflows/release.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,8 @@ jobs:
2222

2323
- uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0
2424
with:
25-
go-version: '1.23'
26-
27-
- run: make inst
25+
go-version: '1.24'
26+
check-latest: true
2827

2928
- name: Login to GitHub Container Registry
3029
uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0
@@ -33,7 +32,7 @@ jobs:
3332
username: ${{ github.actor }}
3433
password: ${{ secrets.GITHUB_TOKEN }}
3534

36-
- run: goreleaser release
35+
- run: go tool goreleaser release
3736
env:
3837
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
3938

Makefile

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ SHELL := /bin/bash
44

55
.PHONY: all
66
all: ## build pipeline
7-
all: mod inst gen build spell lint test
7+
all: mod gen build spell lint test
88

99
.PHONY: precommit
1010
precommit: ## validate the branch before commit
@@ -30,29 +30,25 @@ mod: ## go mod tidy
3030
go mod tidy
3131
cd tools && go mod tidy
3232

33-
.PHONY: inst
34-
inst: ## go install tools
35-
cd tools && go install $(shell cd tools && go list -e -f '{{ join .Imports " " }}' -tags=tools)
36-
3733
.PHONY: gen
3834
gen: ## go generate
3935
go generate ./...
4036

4137
.PHONY: build
4238
build: ## goreleaser build
43-
goreleaser build --clean --single-target --snapshot
39+
go tool goreleaser build --clean --single-target --snapshot
4440

4541
.PHONY: spell
4642
spell: ## misspell
47-
misspell -error -locale=US -w **.md
43+
go tool misspell -error -locale=US -w **.md
4844

4945
.PHONY: lint
5046
lint: ## golangci-lint
51-
golangci-lint run --fix
47+
go tool golangci-lint run --fix
5248

5349
.PHONY: vuln
5450
vuln: ## govulncheck
55-
govulncheck ./...
51+
go tool govulncheck ./...
5652

5753
.PHONY: test
5854
test: ## go test

README.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,6 @@ Notable files:
9898
- [.goreleaser.yml](.goreleaser.yml) - GoReleaser configuration,
9999
- [Dockerfile](Dockerfile) - Dockerfile used by GoReleaser to create a container image,
100100
- [Makefile](Makefile) - Make targets used for development, [CI build](.github/workflows) and [.vscode/tasks.json](.vscode/tasks.json),
101-
- [go.mod](go.mod) - [Go module definition](https://github.com/golang/go/wiki/Modules#gomod),
102-
- [tools.go](tools.go) - [build tools](https://github.com/golang/go/wiki/Modules#how-can-i-track-tool-dependencies-for-a-module).
103101

104102
## FAQ
105103

go.mod

Lines changed: 478 additions & 0 deletions
Large diffs are not rendered by default.

tools/go.sum renamed to go.sum

Lines changed: 361 additions & 189 deletions
Large diffs are not rendered by default.

tools/go.mod

Lines changed: 0 additions & 475 deletions
This file was deleted.

tools/tools.go

Lines changed: 0 additions & 15 deletions
This file was deleted.

0 commit comments

Comments
 (0)