From 1a62ce471e8c751ae30400740958261701e191e5 Mon Sep 17 00:00:00 2001 From: Eugene Burkov Date: Wed, 8 May 2024 15:07:36 +0300 Subject: [PATCH] Pull request 2217: Upd Go Squashed commit of the following: commit a5be7f94ba2c0ca80a275d9c3861e1450bab9c85 Author: Eugene Burkov Date: Wed May 8 15:01:52 2024 +0300 all: upd go --- .github/workflows/build.yml | 2 +- .github/workflows/lint.yml | 2 +- CHANGELOG.md | 7 +++++++ Makefile | 2 +- bamboo-specs/release.yaml | 6 +++--- bamboo-specs/test.yaml | 4 ++-- go.mod | 2 +- internal/tools/go.mod | 2 +- 8 files changed, 17 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f30180e9..fcc514df 100644 --- a/.github/workflows/build.yml +++ b/.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': diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 2e606520..2fe919d6 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -1,7 +1,7 @@ 'name': 'lint' 'env': - 'GO_VERSION': '1.22.2' + 'GO_VERSION': '1.22.3' 'on': 'push': diff --git a/CHANGELOG.md b/CHANGELOG.md index aa21c781..87aa2fc2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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]). @@ -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 + diff --git a/Makefile b/Makefile index 55939ff9..66c387ea 100644 --- a/Makefile +++ b/Makefile @@ -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 diff --git a/bamboo-specs/release.yaml b/bamboo-specs/release.yaml index 9a991bc9..ec0a294b 100644 --- a/bamboo-specs/release.yaml +++ b/bamboo-specs/release.yaml @@ -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': @@ -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]+': @@ -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' diff --git a/bamboo-specs/test.yaml b/bamboo-specs/test.yaml index b18ab1c0..b58fdcd6 100644 --- a/bamboo-specs/test.yaml +++ b/bamboo-specs/test.yaml @@ -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': @@ -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' diff --git a/go.mod b/go.mod index 2c6a13db..ac607fd9 100644 --- a/go.mod +++ b/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 diff --git a/internal/tools/go.mod b/internal/tools/go.mod index a6e26c14..a64d048d 100644 --- a/internal/tools/go.mod +++ b/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