Skip to content

Commit 1e96502

Browse files
zimmskiMunsio
authored andcommitted
Install Go tooling over go.mod
1 parent 1e76f13 commit 1e96502

File tree

7 files changed

+189
-42
lines changed

7 files changed

+189
-42
lines changed

.github/workflows/job-lint.yml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,6 @@ jobs:
1313
with:
1414
go-version-file: "go.mod"
1515

16-
- name: Install ack
17-
run: sudo apt-get update && sudo apt-get install -y ack-grep
18-
shell: bash # Explicitly use Bash because otherwise failing Windows jobs are not erroring.
19-
20-
- name: Install testing linting
21-
run: make install-tools-linting
22-
shell: bash # Explicitly use Bash because otherwise failing Windows jobs are not erroring.
23-
2416
- name: Lint
2517
run: make lint
2618
shell: bash # Explicitly use Bash because otherwise failing Windows jobs are not erroring.

.github/workflows/job-test.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@ jobs:
6161

6262
- name: Install testing tools
6363
run: |
64-
make install-tools-testing
6564
go run scripts/github-ci/main.go
6665
shell: bash # Explicitly use Bash because otherwise failing Windows jobs are not erroring.
6766

Dockerfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,5 +108,4 @@ RUN sed -i "s/args: \[\(.*\)\]/args: [\1, '--single-process']/" /home/ubuntu/.np
108108
# Install the binary.
109109
COPY --from=builder --chown=ubuntu:ubuntu /app/eval-dev-quality /app/.eval-dev-quality/bin/
110110
ENV PATH="${PATH}:/app/.eval-dev-quality/bin"
111-
RUN make install-tools-testing
112111
RUN make install-tools /app/.eval-dev-quality/bin

Makefile

Lines changed: 6 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -47,34 +47,22 @@ install: # [Go package] - # Build and install everything, or only the specified
4747
go install -v -ldflags="$(GO_LDFLAGS)" $(PACKAGE)
4848
.PHONY: install
4949

50-
install-all: install install-tools install-tools-linting install-tools-testing # Install everything for and of this repository.
50+
install-all: install install-tools # Install everything for and of this repository.
5151
.PHONY: install-all
5252

5353
install-tools: # Install tools that are required for running the evaluation.
5454
eval-dev-quality install-tools $(if $(ARGS), --install-tools-path $(word 1,$(ARGS)))
5555
.PHONY: install-tools
5656

57-
install-tools-linting: # Install tools that are used for linting.
58-
go install -v github.com/kisielk/[email protected]
59-
go install -v github.com/mgechev/[email protected]
60-
go install -v golang.org/x/tools/cmd/[email protected] # Aligned with version `gopls/v0.17.1`.
61-
go install -v honnef.co/go/tools/cmd/[email protected]
62-
.PHONY: install-tools-linting
63-
64-
install-tools-testing: # Install tools that are used for testing.
65-
go install -v github.com/vektra/mockery/[email protected]
66-
go install -v gotest.tools/[email protected]
67-
.PHONY: install-tools-testing
68-
6957
generate: # Run code generation.
70-
mockery
58+
go tool github.com/vektra/mockery/v2
7159
.PHONY: generate
7260

7361
lint: # Check repository.
74-
errcheck ./...
62+
go tool github.com/kisielk/errcheck ./...
7563
go vet ./...
76-
revive -config $(ROOT_DIR)/conf/language/golang/revive.toml -set_exit_status ./...
77-
staticcheck ./...
64+
go tool github.com/mgechev/revive -config $(ROOT_DIR)/conf/language/golang/revive.toml -set_exit_status ./...
65+
go tool honnef.co/go/tools/cmd/staticcheck ./...
7866
go run scripts/deadcode/main.go
7967
.PHONY: lint
8068

@@ -93,5 +81,5 @@ require-clean-worktree: # Check if there are uncommitted changes.
9381

9482
test: # [<Go package] - # Test everything, or only the specified package.
9583
@# WORKAROUND We run all tests sequentially until we have a better concurrency-safe solution for Ollama.
96-
gotestsum --format standard-verbose --hide-summary skipped -- $(NO_UNIT_TEST_CACHE) -p 1 -race -test.timeout $(UNIT_TEST_TIMEOUT)s -test.run='$(word 2,$(ARGS))' -v $(if $(ARGS), $(word 1,$(ARGS)), $(PACKAGE))
84+
go tool gotest.tools/gotestsum --format standard-verbose --hide-summary skipped -- $(NO_UNIT_TEST_CACHE) -p 1 -race -test.timeout $(UNIT_TEST_TIMEOUT)s -test.run='$(word 2,$(ARGS))' -v $(if $(ARGS), $(word 1,$(ARGS)), $(PACKAGE))
9785
.PHONY: test

go.mod

Lines changed: 57 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,38 +3,87 @@ module github.com/symflower/eval-dev-quality
33
go 1.24.1
44

55
require (
6+
github.com/Masterminds/semver/v3 v3.3.1
67
github.com/avast/retry-go v3.0.0+incompatible
8+
github.com/google/uuid v1.6.0
79
github.com/jessevdk/go-flags v1.6.1
810
github.com/kr/pretty v0.3.1
911
github.com/pkg/errors v0.9.1
1012
github.com/sashabaranov/go-openai v1.38.0
1113
github.com/stretchr/testify v1.10.0
1214
github.com/symflower/lockfile v0.0.0-20240419143922-aa3b60940c84
13-
github.com/zimmski/osutil v1.7.0
15+
github.com/zimmski/osutil v1.7.1
1416
golang.org/x/exp v0.0.0-20250305212735-054e65f0b394
1517
golang.org/x/mod v0.24.0
1618
gonum.org/v1/gonum v0.16.0
1719
)
1820

1921
require (
20-
github.com/Masterminds/semver/v3 v3.3.1
21-
github.com/google/uuid v1.6.0
22-
)
23-
24-
require (
25-
github.com/davecgh/go-spew v1.1.1 // indirect
22+
github.com/BurntSushi/toml v1.4.1-0.20240526193622-a339e1f7089c // indirect
23+
github.com/bitfield/gotestdox v0.2.2 // indirect
24+
github.com/chavacava/garif v0.1.0 // indirect
25+
github.com/chigopher/pathlib v0.19.1 // indirect
26+
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
27+
github.com/dnephin/pflag v1.0.7 // indirect
28+
github.com/fatih/color v1.18.0 // indirect
29+
github.com/fatih/structtag v1.2.0 // indirect
30+
github.com/fsnotify/fsnotify v1.8.0 // indirect
31+
github.com/go-viper/mapstructure/v2 v2.2.1 // indirect
32+
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
33+
github.com/hashicorp/go-version v1.7.0 // indirect
34+
github.com/huandu/xstrings v1.5.0 // indirect
35+
github.com/iancoleman/strcase v0.3.0 // indirect
36+
github.com/inconshreveable/mousetrap v1.1.0 // indirect
37+
github.com/jinzhu/copier v0.4.0 // indirect
38+
github.com/kisielk/errcheck v1.9.0 // indirect
2639
github.com/kr/text v0.2.0 // indirect
40+
github.com/mattn/go-colorable v0.1.14 // indirect
41+
github.com/mattn/go-isatty v0.0.20 // indirect
42+
github.com/mattn/go-runewidth v0.0.16 // indirect
43+
github.com/mgechev/dots v0.0.0-20210922191527-e955255bf517 // indirect
44+
github.com/mgechev/revive v1.7.0 // indirect
2745
github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db // indirect
28-
github.com/pmezard/go-difflib v1.0.0 // indirect
46+
github.com/mitchellh/go-homedir v1.1.0 // indirect
47+
github.com/mitchellh/mapstructure v1.5.0 // indirect
48+
github.com/olekukonko/tablewriter v0.0.5 // indirect
49+
github.com/pelletier/go-toml/v2 v2.2.3 // indirect
50+
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
2951
github.com/rivo/uniseg v0.4.7 // indirect
3052
github.com/rogpeppe/go-internal v1.14.1 // indirect
53+
github.com/rs/zerolog v1.33.0 // indirect
54+
github.com/sagikazarmark/locafero v0.8.0 // indirect
3155
github.com/schollz/progressbar/v3 v3.18.0 // indirect
56+
github.com/sourcegraph/conc v0.3.0 // indirect
57+
github.com/spf13/afero v1.14.0 // indirect
58+
github.com/spf13/cast v1.7.1 // indirect
59+
github.com/spf13/cobra v1.9.1 // indirect
60+
github.com/spf13/pflag v1.0.6 // indirect
61+
github.com/spf13/viper v1.20.0 // indirect
3262
github.com/stretchr/objx v0.5.2 // indirect
63+
github.com/subosito/gotenv v1.6.0 // indirect
3364
github.com/symflower/pretty v1.0.0 // indirect
3465
github.com/termie/go-shutil v0.0.0-20140729215957-bcacb06fecae // indirect
3566
github.com/ulikunitz/xz v0.5.12 // indirect
67+
github.com/vektra/mockery/v2 v2.53.2 // indirect
3668
github.com/yuin/goldmark v1.7.8 // indirect
69+
go.uber.org/multierr v1.11.0 // indirect
70+
golang.org/x/exp/typeparams v0.0.0-20250305212735-054e65f0b394 // indirect
71+
golang.org/x/sync v0.12.0 // indirect
3772
golang.org/x/sys v0.31.0 // indirect
73+
golang.org/x/telemetry v0.0.0-20250310203348-fdfaad844314 // indirect
3874
golang.org/x/term v0.30.0 // indirect
75+
golang.org/x/text v0.23.0 // indirect
76+
golang.org/x/tools v0.31.0 // indirect
3977
gopkg.in/yaml.v3 v3.0.1 // indirect
78+
gotest.tools/gotestsum v1.12.1 // indirect
79+
honnef.co/go/tools v0.6.1 // indirect
80+
)
81+
82+
tool (
83+
github.com/kisielk/errcheck
84+
github.com/mgechev/revive
85+
github.com/vektra/mockery/v2
86+
golang.org/x/tools/cmd/deadcode
87+
gotest.tools/gotestsum
88+
honnef.co/go/tools/cmd/staticcheck
4089
)

0 commit comments

Comments
 (0)