Skip to content

Commit

Permalink
all: upd go
Browse files Browse the repository at this point in the history
  • Loading branch information
EugeneOne1 committed May 8, 2024
1 parent 17c4eeb commit a5be7f9
Show file tree
Hide file tree
Showing 8 changed files with 17 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
@@ -1,7 +1,7 @@
'name': 'build'

'env':
'GO_VERSION': '1.22.2'
'GO_VERSION': '1.22.3'
'NODE_VERSION': '16'

'on':
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
@@ -1,7 +1,7 @@
'name': 'lint'

'env':
'GO_VERSION': '1.22.2'
'GO_VERSION': '1.22.3'

'on':
'push':
Expand Down
7 changes: 7 additions & 0 deletions CHANGELOG.md
Expand Up @@ -23,6 +23,11 @@ See also the [v0.107.49 GitHub milestone][ms-v0.107.49].
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

- Support for comments in the ipset file ([#5345]).
Expand Down Expand Up @@ -70,6 +75,8 @@ NOTE: Add new changes BELOW THIS COMMENT.
[#6875]: https://github.com/AdguardTeam/AdGuardHome/issues/6875
[#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.
-->
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Expand Up @@ -27,7 +27,7 @@ DIST_DIR = dist
GOAMD64 = v1
GOPROXY = https://goproxy.cn|https://proxy.golang.org|direct
GOSUMDB = sum.golang.google.cn
GOTOOLCHAIN = go1.22.2
GOTOOLCHAIN = go1.22.3
GPG_KEY = devteam@adguard.com
GPG_KEY_PASSPHRASE = not-a-real-password
NPM = npm
Expand Down
6 changes: 3 additions & 3 deletions bamboo-specs/release.yaml
Expand Up @@ -8,7 +8,7 @@
'variables':
'channel': 'edge'
'dockerFrontend': 'adguard/home-js-builder:1.1'
'dockerGo': 'adguard/go-builder:1.22.2--1'
'dockerGo': 'adguard/go-builder:1.22.3--1'

'stages':
- 'Build frontend':
Expand Down Expand Up @@ -266,7 +266,7 @@
'variables':
'channel': 'beta'
'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 is built.
- '^release-v[0-9]+\.[0-9]+\.[0-9]+':
Expand All @@ -282,4 +282,4 @@
'variables':
'channel': 'release'
'dockerFrontend': 'adguard/home-js-builder:1.1'
'dockerGo': 'adguard/go-builder:1.22.2--1'
'dockerGo': 'adguard/go-builder:1.22.3--1'
4 changes: 2 additions & 2 deletions bamboo-specs/test.yaml
Expand Up @@ -6,7 +6,7 @@
'name': 'AdGuard Home - Build and run tests'
'variables':
'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'

'stages':
Expand Down Expand Up @@ -195,5 +195,5 @@
# may need to build a few of these.
'variables':
'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'
2 changes: 1 addition & 1 deletion go.mod
@@ -1,6 +1,6 @@
module github.com/AdguardTeam/AdGuardHome

go 1.22.2
go 1.22.3

require (
github.com/AdguardTeam/dnsproxy v0.71.1
Expand Down
2 changes: 1 addition & 1 deletion internal/tools/go.mod
@@ -1,6 +1,6 @@
module github.com/AdguardTeam/AdGuardHome/internal/tools

go 1.22.2
go 1.22.3

require (
github.com/fzipp/gocyclo v0.6.0
Expand Down

0 comments on commit a5be7f9

Please sign in to comment.