Skip to content

Commit d0e7e93

Browse files
authored
Merge pull request #118 from bmf-san/feature/update-go-version
Update go version 1.22.3
2 parents b4f35ce + 108fa37 commit d0e7e93

File tree

3 files changed

+20
-39
lines changed

3 files changed

+20
-39
lines changed

.circleci/config.yml

Lines changed: 19 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -33,31 +33,24 @@ jobs:
3333
- run:
3434
name: "Run go test"
3535
command: make test
36-
- when:
37-
condition:
38-
or:
39-
- equal: [ '1.21', << parameters.version >> ]
40-
- equal: [ '1.20', << parameters.version >> ]
41-
- equal: [ '1.19', << parameters.version >> ]
42-
steps:
43-
- run:
44-
name: "Install tools"
45-
command: make install-tools
46-
- run:
47-
name: "Run errcheck"
48-
command: make errcheck
49-
- run:
50-
name: "Run go staticcheck"
51-
command: make staticcheck
52-
- run:
53-
name: "Run gosec"
54-
command: make gosec
55-
- run:
56-
name: "Run benchstat"
57-
command: make benchstat
58-
- run:
59-
name: "Run govulncheck"
60-
command: make govulncheck
36+
- run:
37+
name: "Install tools"
38+
command: make install-tools
39+
- run:
40+
name: "Run errcheck"
41+
command: make errcheck
42+
- run:
43+
name: "Run go staticcheck"
44+
command: make staticcheck
45+
- run:
46+
name: "Run gosec"
47+
command: make gosec
48+
- run:
49+
name: "Run benchstat"
50+
command: make benchstat
51+
- run:
52+
name: "Run govulncheck"
53+
command: make govulncheck
6154
- run:
6255
name: Build go
6356
command: go build
@@ -76,4 +69,4 @@ workflows:
7669
- test:
7770
matrix:
7871
parameters:
79-
version: ["1.21", "1.20", "1.19", "1.18", "1.17", "1.16"]
72+
version: ["1.22"]

Makefile

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,24 +7,12 @@ help:
77

88
.PHONY: install-tools
99
install-tools: ## Install staticcheck.
10-
ifeq ($(shell command -v staticcheck 2> /dev/null),)
1110
go install honnef.co/go/tools/cmd/staticcheck@latest
12-
endif
13-
ifeq ($(shell command -v goimports 2> /dev/null),)
1411
go install golang.org/x/tools/cmd/goimports@latest
15-
endif
16-
ifeq ($(shell command -v errcheck 2> /dev/null),)
1712
go install github.com/kisielk/errcheck@latest
18-
endif
19-
ifeq ($(shell command -v gosec 2> /dev/null),)
2013
go install github.com/securego/gosec/v2/cmd/gosec@latest
21-
endif
22-
ifeq ($(shell command -v benchstat 2> /dev/null),)
2314
go install golang.org/x/perf/cmd/benchstat@latest
24-
endif
25-
ifeq ($(shell govulncheck ./... 2> /dev/null),)
2615
go install golang.org/x/vuln/cmd/govulncheck@latest
27-
endif
2816

2917
.PHONY: gofmt
3018
gofmt: ## Run gofmt.

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
module github.com/bmf-san/goblin
22

3-
go 1.21
3+
go 1.22.3

0 commit comments

Comments
 (0)