Pull request 2035: upd-go

Squashed commit of the following:

commit 336c11f1006e4dedfbf721eec394a905fd9baa60
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Wed Oct 11 17:00:24 2023 +0300

    all: upd go
This commit is contained in:
Ainar Garipov 2023-10-11 17:14:54 +03:00
parent 6a36615629
commit 5fa11567aa
7 changed files with 14 additions and 12 deletions

View File

@ -1,7 +1,7 @@
'name': 'build'
'env':
'GO_VERSION': '1.20.9'
'GO_VERSION': '1.20.10'
'NODE_VERSION': '16'
'on':

View File

@ -1,7 +1,7 @@
'name': 'lint'
'env':
'GO_VERSION': '1.20.9'
'GO_VERSION': '1.20.10'
'on':
'push':

View File

@ -26,7 +26,8 @@ NOTE: Add new changes BELOW THIS COMMENT.
### Security
- Go version has been updated to prevent the possibility of exploiting the
CVE-2023-39325 Go vulnerability fixed in [Go 1.20.9][go-1.20.9].
CVE-2023-39323 and CVE-2023-39325 Go vulnerabilities fixed in
[Go 1.20.9][go-1.20.9] and [Go 1.20.10][go-1.20.10].
### Added
@ -55,7 +56,8 @@ NOTE: Add new changes BELOW THIS COMMENT.
[#6233]: https://github.com/AdguardTeam/AdGuardHome/issues/6233
[#6280]: https://github.com/AdguardTeam/AdGuardHome/issues/6280
[go-1.20.9]: https://groups.google.com/g/golang-announce/c/XBa1oHDevAo/m/desYyx3qAgAJ
[go-1.20.9]: https://groups.google.com/g/golang-announce/c/XBa1oHDevAo/m/desYyx3qAgAJ
[go-1.20.10]: https://groups.google.com/g/golang-announce/c/iNNxDTCjZvo/m/UDd7VKQuAAAJ
<!--
NOTE: Add new changes ABOVE THIS COMMENT.

View File

@ -7,7 +7,7 @@
# Make sure to sync any changes with the branch overrides below.
'variables':
'channel': 'edge'
'dockerGo': 'adguard/golang-ubuntu:7.3'
'dockerGo': 'adguard/golang-ubuntu:7.4'
'stages':
- 'Build frontend':
@ -272,7 +272,7 @@
# need to build a few of these.
'variables':
'channel': 'beta'
'dockerGo': 'adguard/golang-ubuntu:7.3'
'dockerGo': 'adguard/golang-ubuntu:7.4'
# release-vX.Y.Z branches are the branches from which the actual final
# release is built.
- '^release-v[0-9]+\.[0-9]+\.[0-9]+':
@ -287,4 +287,4 @@
# are the ones that actually get released.
'variables':
'channel': 'release'
'dockerGo': 'adguard/golang-ubuntu:7.3'
'dockerGo': 'adguard/golang-ubuntu:7.4'

View File

@ -10,7 +10,7 @@
# Make sure to sync any changes with the branch overrides below.
'variables':
'channel': 'edge'
'dockerGo': 'adguard/golang-ubuntu:7.3'
'dockerGo': 'adguard/golang-ubuntu:7.4'
'snapcraftChannel': 'edge'
'stages':
@ -191,7 +191,7 @@
# need to build a few of these.
'variables':
'channel': 'beta'
'dockerGo': 'adguard/golang-ubuntu:7.3'
'dockerGo': 'adguard/golang-ubuntu:7.4'
'snapcraftChannel': 'beta'
# release-vX.Y.Z branches are the branches from which the actual final
# release is built.
@ -207,5 +207,5 @@
# are the ones that actually get released.
'variables':
'channel': 'release'
'dockerGo': 'adguard/golang-ubuntu:7.3'
'dockerGo': 'adguard/golang-ubuntu:7.4'
'snapcraftChannel': 'candidate'

View File

@ -5,7 +5,7 @@
'key': 'AHBRTSPECS'
'name': 'AdGuard Home - Build and run tests'
'variables':
'dockerGo': 'adguard/golang-ubuntu:7.3'
'dockerGo': 'adguard/golang-ubuntu:7.4'
'stages':
- 'Tests':

View File

@ -35,7 +35,7 @@ set -f -u
go_version="$( "${GO:-go}" version )"
readonly go_version
go_min_version='go1.20.9'
go_min_version='go1.20.10'
go_version_msg="
warning: your go version (${go_version}) is different from the recommended minimal one (${go_min_version}).
if you have the version installed, please set the GO environment variable.