From a4c0cefb42481d76b052e212eee83e7888aea944 Mon Sep 17 00:00:00 2001 From: Ainar Garipov Date: Wed, 2 Nov 2022 14:22:10 +0300 Subject: [PATCH] Pull request: upd-go Merge in DNS/adguard-home from upd-go to master Squashed commit of the following: commit 9548937ef70f195bbd9b6d19093bb88e9d5f0330 Author: Ainar Garipov Date: Wed Nov 2 14:09:46 2022 +0300 all: upd go, tools --- .github/workflows/build.yml | 2 +- .github/workflows/lint.yml | 2 +- bamboo-specs/release.yaml | 6 +++--- bamboo-specs/test.yaml | 2 +- internal/tools/go.mod | 4 ++-- internal/tools/go.sum | 8 ++++---- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index bc2caa31258..224fc42c97b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,7 +1,7 @@ 'name': 'build' 'env': - 'GO_VERSION': '1.18.7' + 'GO_VERSION': '1.18.8' 'NODE_VERSION': '14' 'on': diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 1028b6b10f4..d1dc8163743 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -1,7 +1,7 @@ 'name': 'lint' 'env': - 'GO_VERSION': '1.18.7' + 'GO_VERSION': '1.18.8' 'on': 'push': diff --git a/bamboo-specs/release.yaml b/bamboo-specs/release.yaml index 4232b734e80..86cc16ec7e9 100644 --- a/bamboo-specs/release.yaml +++ b/bamboo-specs/release.yaml @@ -7,7 +7,7 @@ # Make sure to sync any changes with the branch overrides below. 'variables': 'channel': 'edge' - 'dockerGo': 'adguard/golang-ubuntu:5.2' + 'dockerGo': 'adguard/golang-ubuntu:5.3' 'stages': - 'Build frontend': @@ -322,7 +322,7 @@ # need to build a few of these. 'variables': 'channel': 'beta' - 'dockerGo': 'adguard/golang-ubuntu:5.2' + 'dockerGo': 'adguard/golang-ubuntu:5.3' # release-vX.Y.Z branches are the branches from which the actual final release # is built. - '^release-v[0-9]+\.[0-9]+\.[0-9]+': @@ -337,4 +337,4 @@ # are the ones that actually get released. 'variables': 'channel': 'release' - 'dockerGo': 'adguard/golang-ubuntu:5.2' + 'dockerGo': 'adguard/golang-ubuntu:5.3' diff --git a/bamboo-specs/test.yaml b/bamboo-specs/test.yaml index 81796e1f273..ac8c67fdbf7 100644 --- a/bamboo-specs/test.yaml +++ b/bamboo-specs/test.yaml @@ -5,7 +5,7 @@ 'key': 'AHBRTSPECS' 'name': 'AdGuard Home - Build and run tests' 'variables': - 'dockerGo': 'adguard/golang-ubuntu:5.2' + 'dockerGo': 'adguard/golang-ubuntu:5.3' 'stages': - 'Tests': diff --git a/internal/tools/go.mod b/internal/tools/go.mod index 326743ce8b8..dcda40eb95b 100644 --- a/internal/tools/go.mod +++ b/internal/tools/go.mod @@ -24,8 +24,8 @@ require ( github.com/kyoh86/nolint v0.0.1 // indirect github.com/nbutton23/zxcvbn-go v0.0.0-20210217022336-fa2cb2858354 // indirect github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect - golang.org/x/exp v0.0.0-20221026153819-32f3d567a233 // indirect - golang.org/x/exp/typeparams v0.0.0-20221026153819-32f3d567a233 // indirect + golang.org/x/exp v0.0.0-20221031165847-c99f073a8326 // indirect + golang.org/x/exp/typeparams v0.0.0-20221031165847-c99f073a8326 // indirect golang.org/x/mod v0.6.0 // indirect golang.org/x/sync v0.1.0 // indirect golang.org/x/sys v0.1.0 // indirect diff --git a/internal/tools/go.sum b/internal/tools/go.sum index 642350b4c72..3e4f57e6cca 100644 --- a/internal/tools/go.sum +++ b/internal/tools/go.sum @@ -53,10 +53,10 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/exp v0.0.0-20221026153819-32f3d567a233 h1:9bNbSKT4RPLEzne0Xh1v3NaNecsa1DKjkOuTbY6V9rI= -golang.org/x/exp v0.0.0-20221026153819-32f3d567a233/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc= -golang.org/x/exp/typeparams v0.0.0-20221026153819-32f3d567a233 h1:KWVQGQHzE6/9esNxDNxLvrj0OPp7EHbu74srRZhEOCE= -golang.org/x/exp/typeparams v0.0.0-20221026153819-32f3d567a233/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk= +golang.org/x/exp v0.0.0-20221031165847-c99f073a8326 h1:QfTh0HpN6hlw6D3vu8DAwC8pBIwikq0AI1evdm+FksE= +golang.org/x/exp v0.0.0-20221031165847-c99f073a8326/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc= +golang.org/x/exp/typeparams v0.0.0-20221031165847-c99f073a8326 h1:fl8k2zg28yA23264d82M4dp+YlJ3ngDcpuB1bewkQi4= +golang.org/x/exp/typeparams v0.0.0-20221031165847-c99f073a8326/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3/go.mod h1:3p9vT2HGsQu2K1YbXdKPJLVgG5VJdoTa1poYQBtP1AY=