Skip to content

Commit

Permalink
all: upd go
Browse files Browse the repository at this point in the history
  • Loading branch information
EugeneOne1 committed Mar 6, 2024
1 parent 7f24fc7 commit fd5e94f
Show file tree
Hide file tree
Showing 8 changed files with 16 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
'name': 'build'

'env':
'GO_VERSION': '1.21.7'
'GO_VERSION': '1.21.8'
'NODE_VERSION': '16'

'on':
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
'name': 'lint'

'env':
'GO_VERSION': '1.21.7'
'GO_VERSION': '1.21.8'

'on':
'push':
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@ NOTE: Add new changes BELOW THIS COMMENT.

- Go version has been updated to prevent the possibility of exploiting the Go
vulnerabilities fixed in Go 1.21.6 and Go 1.21.7.
- Go version has been updated to prevent the possibility of exploiting the
CVE-2024-24783, CVE-2023-45290, CVE-2023-45289, CVE-2024-24785, and
CVE-2024-24784 Go vulnerabilities fixed in [Go 1.21.8][go-1.21.8].

### Added

Expand Down Expand Up @@ -74,6 +77,7 @@ NOTE: Add new changes BELOW THIS COMMENT.
[#6711]: https://github.com/AdguardTeam/AdGuardHome/issues/6711

[go-toolchain]: https://go.dev/blog/toolchain
[go-1.21.8]: https://groups.google.com/g/golang-announce/c/5pwGVUPoMbg

<!--
NOTE: Add new changes ABOVE THIS COMMENT.
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
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.21.7
GOTOOLCHAIN = go1.21.8
GPG_KEY = devteam@adguard.com
GPG_KEY_PASSPHRASE = not-a-real-password
NPM = npm
Expand Down
3 changes: 3 additions & 0 deletions bamboo-specs/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
# Make sure to sync any changes with the branch overrides below.
'variables':
'channel': 'edge'
# TODO(e.burkov): !! update
'dockerGo': 'adguard/golang-ubuntu:8.0'

'stages':
Expand Down Expand Up @@ -272,6 +273,7 @@
# need to build a few of these.
'variables':
'channel': 'beta'
# TODO(e.burkov): !! update
'dockerGo': 'adguard/golang-ubuntu:8.0'
# release-vX.Y.Z branches are the branches from which the actual final
# release is built.
Expand All @@ -287,4 +289,5 @@
# are the ones that actually get released.
'variables':
'channel': 'release'
# TODO(e.burkov): !! update
'dockerGo': 'adguard/golang-ubuntu:8.0'
3 changes: 3 additions & 0 deletions bamboo-specs/snapcraft.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
# Make sure to sync any changes with the branch overrides below.
'variables':
'channel': 'edge'
# TODO(e.burkov): !! update
'dockerGo': 'adguard/golang-ubuntu:8.0'
'snapcraftChannel': 'edge'

Expand Down Expand Up @@ -191,6 +192,7 @@
# need to build a few of these.
'variables':
'channel': 'beta'
# TODO(e.burkov): !! update
'dockerGo': 'adguard/golang-ubuntu:8.0'
'snapcraftChannel': 'beta'
# release-vX.Y.Z branches are the branches from which the actual final
Expand All @@ -207,5 +209,6 @@
# are the ones that actually get released.
'variables':
'channel': 'release'
# TODO(e.burkov): !! update
'dockerGo': 'adguard/golang-ubuntu:8.0'
'snapcraftChannel': 'candidate'
2 changes: 2 additions & 0 deletions bamboo-specs/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
'key': 'AHBRTSPECS'
'name': 'AdGuard Home - Build and run tests'
'variables':
# TODO(e.burkov): !! update
'dockerGo': 'adguard/golang-ubuntu:8.0'
'channel': 'development'

Expand Down Expand Up @@ -127,5 +128,6 @@
# Set the default release channel on the release branch to beta, as we
# may need to build a few of these.
'variables':
# TODO(e.burkov): !! update
'dockerGo': 'adguard/golang-ubuntu:8.0'
'channel': 'candidate'
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/AdguardTeam/AdGuardHome

go 1.21.7
go 1.21.8

require (
github.com/AdguardTeam/dnsproxy v0.65.2
Expand Down

0 comments on commit fd5e94f

Please sign in to comment.