mirrors
/
AdGuardHome
mirror of https://github.com/AdguardTeam/AdGuardHome.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Pull request 2161: Upd Go 

Squashed commit of the following:

commit 304703195e66e935a5900b07d1cefea262a4689d
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Wed Mar 6 15:42:57 2024 +0300

    all: log changes better

commit c47f31ac7f6be6d5bada670065f20c32b0bd29e9
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Wed Mar 6 15:33:19 2024 +0300

    bamboo-specs: upd img

commit 5286ca1afe2c04e9b1d0b55bcbcd02d462947e8c
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Wed Mar 6 14:59:18 2024 +0300

    tools: upd go

commit fd5e94f0d4afadbf48deab1cee4ee23f82f1bd0f
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Wed Mar 6 14:11:05 2024 +0300

    all: upd go
This commit is contained in:
Eugene Burkov 2024-03-06 16:12:40 +03:00
parent 7f24fc7ccc
commit 5565b9e1c1
9 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/build.yml vendored
View File

@ -1,7 +1,7 @@
'name': 'build' 'name': 'build'
'env': 'env':
'GO_VERSION': '1.21.7' 'GO_VERSION': '1.21.8'
'NODE_VERSION': '16' 'NODE_VERSION': '16'
'on': 'on':

2
.github/workflows/lint.yml vendored
View File

@ -1,7 +1,7 @@
'name': 'lint' 'name': 'lint'
'env': 'env':
'GO_VERSION': '1.21.7' 'GO_VERSION': '1.21.8'
'on': 'on':
'push': 'push':

3
CHANGELOG.md
View File

@ -26,7 +26,7 @@ NOTE: Add new changes BELOW THIS COMMENT.
### Security ### Security
- Go version has been updated to prevent the possibility of exploiting the Go - 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. vulnerabilities fixed in [Go 1.21.8][go-1.21.8].
### Added ### Added
@ -74,6 +74,7 @@ NOTE: Add new changes BELOW THIS COMMENT.
[#6711]: https://github.com/AdguardTeam/AdGuardHome/issues/6711 [#6711]: https://github.com/AdguardTeam/AdGuardHome/issues/6711
[go-toolchain]: https://go.dev/blog/toolchain [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. NOTE: Add new changes ABOVE THIS COMMENT.

2
Makefile
View File

@ -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.21.7 GOTOOLCHAIN = go1.21.8
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

6
bamboo-specs/release.yaml
View File

@ -7,7 +7,7 @@
# Make sure to sync any changes with the branch overrides below. # Make sure to sync any changes with the branch overrides below.
'variables': 'variables':
'channel': 'edge' 'channel': 'edge'
'dockerGo': 'adguard/golang-ubuntu:8.0' 'dockerGo': 'adguard/golang-ubuntu:8.1'
'stages': 'stages':
- 'Build frontend': - 'Build frontend':
@ -272,7 +272,7 @@
# need to build a few of these. # need to build a few of these.
'variables': 'variables':
'channel': 'beta' 'channel': 'beta'
'dockerGo': 'adguard/golang-ubuntu:8.0' 'dockerGo': 'adguard/golang-ubuntu:8.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]+':
@ -287,4 +287,4 @@
# are the ones that actually get released. # are the ones that actually get released.
'variables': 'variables':
'channel': 'release' 'channel': 'release'
'dockerGo': 'adguard/golang-ubuntu:8.0' 'dockerGo': 'adguard/golang-ubuntu:8.1'

6
bamboo-specs/snapcraft.yaml
View File

@ -10,7 +10,7 @@
# Make sure to sync any changes with the branch overrides below. # Make sure to sync any changes with the branch overrides below.
'variables': 'variables':
'channel': 'edge' 'channel': 'edge'
'dockerGo': 'adguard/golang-ubuntu:8.0' 'dockerGo': 'adguard/golang-ubuntu:8.1'
'snapcraftChannel': 'edge' 'snapcraftChannel': 'edge'
'stages': 'stages':
@ -191,7 +191,7 @@
# need to build a few of these. # need to build a few of these.
'variables': 'variables':
'channel': 'beta' 'channel': 'beta'
'dockerGo': 'adguard/golang-ubuntu:8.0' 'dockerGo': 'adguard/golang-ubuntu:8.1'
'snapcraftChannel': 'beta' 'snapcraftChannel': 'beta'
# 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.
@ -207,5 +207,5 @@
# are the ones that actually get released. # are the ones that actually get released.
'variables': 'variables':
'channel': 'release' 'channel': 'release'
'dockerGo': 'adguard/golang-ubuntu:8.0' 'dockerGo': 'adguard/golang-ubuntu:8.1'
'snapcraftChannel': 'candidate' 'snapcraftChannel': 'candidate'

4
bamboo-specs/test.yaml
View File

@ -5,7 +5,7 @@
'key': 'AHBRTSPECS' 'key': 'AHBRTSPECS'
'name': 'AdGuard Home - Build and run tests' 'name': 'AdGuard Home - Build and run tests'
'variables': 'variables':
'dockerGo': 'adguard/golang-ubuntu:8.0' 'dockerGo': 'adguard/golang-ubuntu:8.1'
'channel': 'development' 'channel': 'development'
'stages': 'stages':
@ -127,5 +127,5 @@
# Set the default release channel on the release branch to beta, as we # Set the default release channel on the release branch to beta, as we
# may need to build a few of these. # may need to build a few of these.
'variables': 'variables':
'dockerGo': 'adguard/golang-ubuntu:8.0' 'dockerGo': 'adguard/golang-ubuntu:8.1'
'channel': 'candidate' 'channel': 'candidate'

2
go.mod
View File

@ -1,6 +1,6 @@
module github.com/AdguardTeam/AdGuardHome module github.com/AdguardTeam/AdGuardHome
go 1.21.7 go 1.21.8
require ( require (
github.com/AdguardTeam/dnsproxy v0.65.2 github.com/AdguardTeam/dnsproxy v0.65.2

2
internal/tools/go.mod
View File

@ -1,6 +1,6 @@
module github.com/AdguardTeam/AdGuardHome/internal/tools module github.com/AdguardTeam/AdGuardHome/internal/tools
go 1.21.7 go 1.21.8
require ( require (
github.com/fzipp/gocyclo v0.6.0 github.com/fzipp/gocyclo v0.6.0