Pull request 2217: Upd Go
Squashed commit of the following: commit a5be7f94ba2c0ca80a275d9c3861e1450bab9c85 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed May 8 15:01:52 2024 +0300 all: upd go
This commit is contained in:
parent
17c4eeb646
commit
1a62ce471e
|
@ -1,7 +1,7 @@
|
||||||
'name': 'build'
|
'name': 'build'
|
||||||
|
|
||||||
'env':
|
'env':
|
||||||
'GO_VERSION': '1.22.2'
|
'GO_VERSION': '1.22.3'
|
||||||
'NODE_VERSION': '16'
|
'NODE_VERSION': '16'
|
||||||
|
|
||||||
'on':
|
'on':
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
'name': 'lint'
|
'name': 'lint'
|
||||||
|
|
||||||
'env':
|
'env':
|
||||||
'GO_VERSION': '1.22.2'
|
'GO_VERSION': '1.22.3'
|
||||||
|
|
||||||
'on':
|
'on':
|
||||||
'push':
|
'push':
|
||||||
|
|
|
@ -23,6 +23,11 @@ See also the [v0.107.49 GitHub milestone][ms-v0.107.49].
|
||||||
NOTE: Add new changes BELOW THIS COMMENT.
|
NOTE: Add new changes BELOW THIS COMMENT.
|
||||||
-->
|
-->
|
||||||
|
|
||||||
|
### Security
|
||||||
|
|
||||||
|
- Go version has been updated to prevent the possibility of exploiting the Go
|
||||||
|
vulnerabilities fixed in [Go 1.22.3][go-1.22.3].
|
||||||
|
|
||||||
### Added
|
### Added
|
||||||
|
|
||||||
- Support for comments in the ipset file ([#5345]).
|
- Support for comments in the ipset file ([#5345]).
|
||||||
|
@ -70,6 +75,8 @@ NOTE: Add new changes BELOW THIS COMMENT.
|
||||||
[#6875]: https://github.com/AdguardTeam/AdGuardHome/issues/6875
|
[#6875]: https://github.com/AdguardTeam/AdGuardHome/issues/6875
|
||||||
[#6882]: https://github.com/AdguardTeam/AdGuardHome/issues/6882
|
[#6882]: https://github.com/AdguardTeam/AdGuardHome/issues/6882
|
||||||
|
|
||||||
|
[go-1.22.3]: https://groups.google.com/g/golang-announce/c/wkkO4P9stm0
|
||||||
|
|
||||||
<!--
|
<!--
|
||||||
NOTE: Add new changes ABOVE THIS COMMENT.
|
NOTE: Add new changes ABOVE THIS COMMENT.
|
||||||
-->
|
-->
|
||||||
|
|
2
Makefile
2
Makefile
|
@ -27,7 +27,7 @@ DIST_DIR = dist
|
||||||
GOAMD64 = v1
|
GOAMD64 = v1
|
||||||
GOPROXY = https://goproxy.cn|https://proxy.golang.org|direct
|
GOPROXY = https://goproxy.cn|https://proxy.golang.org|direct
|
||||||
GOSUMDB = sum.golang.google.cn
|
GOSUMDB = sum.golang.google.cn
|
||||||
GOTOOLCHAIN = go1.22.2
|
GOTOOLCHAIN = go1.22.3
|
||||||
GPG_KEY = devteam@adguard.com
|
GPG_KEY = devteam@adguard.com
|
||||||
GPG_KEY_PASSPHRASE = not-a-real-password
|
GPG_KEY_PASSPHRASE = not-a-real-password
|
||||||
NPM = npm
|
NPM = npm
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
'variables':
|
'variables':
|
||||||
'channel': 'edge'
|
'channel': 'edge'
|
||||||
'dockerFrontend': 'adguard/home-js-builder:1.1'
|
'dockerFrontend': 'adguard/home-js-builder:1.1'
|
||||||
'dockerGo': 'adguard/go-builder:1.22.2--1'
|
'dockerGo': 'adguard/go-builder:1.22.3--1'
|
||||||
|
|
||||||
'stages':
|
'stages':
|
||||||
- 'Build frontend':
|
- 'Build frontend':
|
||||||
|
@ -266,7 +266,7 @@
|
||||||
'variables':
|
'variables':
|
||||||
'channel': 'beta'
|
'channel': 'beta'
|
||||||
'dockerFrontend': 'adguard/home-js-builder:1.1'
|
'dockerFrontend': 'adguard/home-js-builder:1.1'
|
||||||
'dockerGo': 'adguard/go-builder:1.22.2--1'
|
'dockerGo': 'adguard/go-builder:1.22.3--1'
|
||||||
# release-vX.Y.Z branches are the branches from which the actual final
|
# release-vX.Y.Z branches are the branches from which the actual final
|
||||||
# release is built.
|
# release is built.
|
||||||
- '^release-v[0-9]+\.[0-9]+\.[0-9]+':
|
- '^release-v[0-9]+\.[0-9]+\.[0-9]+':
|
||||||
|
@ -282,4 +282,4 @@
|
||||||
'variables':
|
'variables':
|
||||||
'channel': 'release'
|
'channel': 'release'
|
||||||
'dockerFrontend': 'adguard/home-js-builder:1.1'
|
'dockerFrontend': 'adguard/home-js-builder:1.1'
|
||||||
'dockerGo': 'adguard/go-builder:1.22.2--1'
|
'dockerGo': 'adguard/go-builder:1.22.3--1'
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
'name': 'AdGuard Home - Build and run tests'
|
'name': 'AdGuard Home - Build and run tests'
|
||||||
'variables':
|
'variables':
|
||||||
'dockerFrontend': 'adguard/home-js-builder:1.1'
|
'dockerFrontend': 'adguard/home-js-builder:1.1'
|
||||||
'dockerGo': 'adguard/go-builder:1.22.2--1'
|
'dockerGo': 'adguard/go-builder:1.22.3--1'
|
||||||
'channel': 'development'
|
'channel': 'development'
|
||||||
|
|
||||||
'stages':
|
'stages':
|
||||||
|
@ -195,5 +195,5 @@
|
||||||
# may need to build a few of these.
|
# may need to build a few of these.
|
||||||
'variables':
|
'variables':
|
||||||
'dockerFrontend': 'adguard/home-js-builder:1.1'
|
'dockerFrontend': 'adguard/home-js-builder:1.1'
|
||||||
'dockerGo': 'adguard/go-builder:1.22.2--1'
|
'dockerGo': 'adguard/go-builder:1.22.3--1'
|
||||||
'channel': 'candidate'
|
'channel': 'candidate'
|
||||||
|
|
2
go.mod
2
go.mod
|
@ -1,6 +1,6 @@
|
||||||
module github.com/AdguardTeam/AdGuardHome
|
module github.com/AdguardTeam/AdGuardHome
|
||||||
|
|
||||||
go 1.22.2
|
go 1.22.3
|
||||||
|
|
||||||
require (
|
require (
|
||||||
github.com/AdguardTeam/dnsproxy v0.71.1
|
github.com/AdguardTeam/dnsproxy v0.71.1
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
module github.com/AdguardTeam/AdGuardHome/internal/tools
|
module github.com/AdguardTeam/AdGuardHome/internal/tools
|
||||||
|
|
||||||
go 1.22.2
|
go 1.22.3
|
||||||
|
|
||||||
require (
|
require (
|
||||||
github.com/fzipp/gocyclo v0.6.0
|
github.com/fzipp/gocyclo v0.6.0
|
||||||
|
|
Loading…
Reference in New Issue