Skip to content

Commit 6fe4b94

Browse files
EugeneOne1EugeneOne1
committed
Pull request 2276: Update Go & tools
Squashed commit of the following: commit 7462988 Author: Eugene Burkov <[email protected]> Date: Tue Sep 10 14:35:51 2024 +0300 all: fix docs commit 238ff1d Author: Eugene Burkov <[email protected]> Date: Tue Sep 10 14:28:27 2024 +0300 all: upd go & tools
1 parent b443cf3 commit 6fe4b94

File tree

11 files changed

+220
-49
lines changed

11 files changed

+220
-49
lines changed

‎.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
'name': 'build'
22

33
'env':
4-
'GO_VERSION': '1.22.6'
4+
'GO_VERSION': '1.23.1'
55
'NODE_VERSION': '16'
66

77
'on':

‎.github/workflows/lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
'name': 'lint'
22

33
'env':
4-
'GO_VERSION': '1.22.6'
4+
'GO_VERSION': '1.23.1'
55

66
'on':
77
'push':

‎CHANGELOG.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,11 @@ See also the [v0.107.53 GitHub milestone][ms-v0.107.53].
2727
NOTE: Add new changes BELOW THIS COMMENT.
2828
-->
2929

30+
### Security
31+
32+
- Go version has been updated to prevent the possibility of exploiting the Go
33+
vulnerabilities fixed in [1.23.1][go-1.23.1].
34+
3035
### Added
3136

3237
- Support for 64-bit RISC-V architecture ([#5704]).
@@ -36,7 +41,6 @@ NOTE: Add new changes BELOW THIS COMMENT.
3641

3742
- Upstream server URL domain names requirements has been relaxed and now follow
3843
the same rules as their domain specifications.
39-
- Go version has been updated to [1.22.6][go-1.22.6].
4044

4145
### Fixed
4246

@@ -49,7 +53,7 @@ NOTE: Add new changes BELOW THIS COMMENT.
4953
[#7154]: https://github.com/AdguardTeam/AdGuardHome/pull/7154
5054
[#7155]: https://github.com/AdguardTeam/AdGuardHome/pull/7155
5155

52-
[go-1.22.6]: https://groups.google.com/g/golang-announce/c/X4q_-Wf-5g4
56+
[go-1.23.1]: https://groups.google.com/g/golang-announce/c/K-cEzDeCtpc
5357

5458
<!--
5559
NOTE: Add new changes ABOVE THIS COMMENT.

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ DIST_DIR = dist
2727
GOAMD64 = v1
2828
GOPROXY = https://proxy.golang.org|direct
2929
GOSUMDB = sum.golang.google.cn
30-
GOTOOLCHAIN = go1.22.6
30+
GOTOOLCHAIN = go1.23.1
3131
GOTELEMETRY = off
3232
GPG_KEY = [email protected]
3333
GPG_KEY_PASSPHRASE = not-a-real-password

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ Run `make init` to prepare the development environment.
205205

206206
You will need this to build AdGuard Home:
207207

208-
- [Go](https://golang.org/dl/) v1.22 or later;
208+
- [Go](https://golang.org/dl/) v1.23 or later;
209209
- [Node.js](https://nodejs.org/en/download/) v18.18 or later;
210210
- [npm](https://www.npmjs.com/) v8 or later;
211211

‎bamboo-specs/release.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
'variables':
99
'channel': 'edge'
1010
'dockerFrontend': 'adguard/home-js-builder:2.0'
11-
'dockerGo': 'adguard/go-builder:1.22.6--1'
11+
'dockerGo': 'adguard/go-builder:1.23.1--1'
1212

1313
'stages':
1414
- 'Build frontend':
@@ -266,7 +266,7 @@
266266
'variables':
267267
'channel': 'beta'
268268
'dockerFrontend': 'adguard/home-js-builder:2.0'
269-
'dockerGo': 'adguard/go-builder:1.22.6--1'
269+
'dockerGo': 'adguard/go-builder:1.23.1--1'
270270
# release-vX.Y.Z branches are the branches from which the actual final
271271
# release is built.
272272
- '^release-v[0-9]+\.[0-9]+\.[0-9]+':
@@ -282,4 +282,4 @@
282282
'variables':
283283
'channel': 'release'
284284
'dockerFrontend': 'adguard/home-js-builder:2.0'
285-
'dockerGo': 'adguard/go-builder:1.22.6--1'
285+
'dockerGo': 'adguard/go-builder:1.23.1--1'

‎bamboo-specs/test.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
'name': 'AdGuard Home - Build and run tests'
77
'variables':
88
'dockerFrontend': 'adguard/home-js-builder:2.0'
9-
'dockerGo': 'adguard/go-builder:1.22.6--1'
9+
'dockerGo': 'adguard/go-builder:1.23.1--1'
1010
'channel': 'development'
1111

1212
'stages':
@@ -196,5 +196,5 @@
196196
# may need to build a few of these.
197197
'variables':
198198
'dockerFrontend': 'adguard/home-js-builder:2.0'
199-
'dockerGo': 'adguard/go-builder:1.22.6--1'
199+
'dockerGo': 'adguard/go-builder:1.23.1--1'
200200
'channel': 'candidate'

‎go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/AdguardTeam/AdGuardHome
22

3-
go 1.22.6
3+
go 1.23.1
44

55
require (
66
github.com/AdguardTeam/dnsproxy v0.73.0

‎internal/tools/go.mod

Lines changed: 38 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,65 @@
11
module github.com/AdguardTeam/AdGuardHome/internal/tools
22

3-
go 1.22.6
3+
go 1.23.1
44

55
require (
66
github.com/fzipp/gocyclo v0.6.0
77
github.com/golangci/misspell v0.6.0
88
github.com/gordonklaus/ineffassign v0.1.0
99
github.com/kisielk/errcheck v1.7.0
1010
github.com/kyoh86/looppointer v0.2.1
11-
github.com/securego/gosec/v2 v2.20.0
11+
github.com/securego/gosec/v2 v2.21.2
1212
github.com/uudashr/gocognit v1.1.3
13-
golang.org/x/tools v0.24.0
13+
golang.org/x/tools v0.25.0
1414
golang.org/x/vuln v1.1.3
1515
honnef.co/go/tools v0.5.1
1616
mvdan.cc/gofumpt v0.7.0
1717
mvdan.cc/unparam v0.0.0-20240528143540-8a5130ca722f
1818
)
1919

2020
require (
21+
cloud.google.com/go v0.115.1 // indirect
22+
cloud.google.com/go/ai v0.8.2 // indirect
23+
cloud.google.com/go/auth v0.9.3 // indirect
24+
cloud.google.com/go/auth/oauth2adapt v0.2.4 // indirect
25+
cloud.google.com/go/compute/metadata v0.5.0 // indirect
26+
cloud.google.com/go/longrunning v0.6.0 // indirect
2127
github.com/BurntSushi/toml v1.4.1-0.20240526193622-a339e1f7089c // indirect
2228
github.com/ccojocar/zxcvbn-go v1.0.2 // indirect
29+
github.com/felixge/httpsnoop v1.0.4 // indirect
30+
github.com/go-logr/logr v1.4.2 // indirect
31+
github.com/go-logr/stdr v1.2.2 // indirect
32+
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
33+
github.com/google/generative-ai-go v0.18.0 // indirect
2334
github.com/google/go-cmp v0.6.0 // indirect
35+
github.com/google/s2a-go v0.1.8 // indirect
2436
github.com/google/uuid v1.6.0 // indirect
37+
github.com/googleapis/enterprise-certificate-proxy v0.3.4 // indirect
38+
github.com/googleapis/gax-go/v2 v2.13.0 // indirect
2539
github.com/gookit/color v1.5.4 // indirect
2640
github.com/kyoh86/nolint v0.0.1 // indirect
2741
github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect
28-
golang.org/x/exp/typeparams v0.0.0-20240808152545-0cdaa3abc0fa // indirect
29-
golang.org/x/mod v0.20.0 // indirect
42+
go.opencensus.io v0.24.0 // indirect
43+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.54.0 // indirect
44+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.54.0 // indirect
45+
go.opentelemetry.io/otel v1.29.0 // indirect
46+
go.opentelemetry.io/otel/metric v1.29.0 // indirect
47+
go.opentelemetry.io/otel/trace v1.29.0 // indirect
48+
golang.org/x/crypto v0.27.0 // indirect
49+
golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 // indirect
50+
golang.org/x/exp/typeparams v0.0.0-20240909161429-701f63a606c0 // indirect
51+
golang.org/x/mod v0.21.0 // indirect
52+
golang.org/x/net v0.29.0 // indirect
53+
golang.org/x/oauth2 v0.23.0 // indirect
3054
golang.org/x/sync v0.8.0 // indirect
31-
golang.org/x/sys v0.24.0 // indirect
32-
golang.org/x/telemetry v0.0.0-20240815150606-0693e6240b9b // indirect
55+
golang.org/x/sys v0.25.0 // indirect
56+
golang.org/x/telemetry v0.0.0-20240906150435-6d9f2eb83631 // indirect
57+
golang.org/x/text v0.18.0 // indirect
58+
golang.org/x/time v0.6.0 // indirect
59+
google.golang.org/api v0.196.0 // indirect
60+
google.golang.org/genproto/googleapis/api v0.0.0-20240903143218-8af14fe29dc1 // indirect
61+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 // indirect
62+
google.golang.org/grpc v1.66.1 // indirect
63+
google.golang.org/protobuf v1.34.2 // indirect
3364
gopkg.in/yaml.v3 v3.0.1 // indirect
3465
)

0 commit comments

Comments
 (0)