From 25361319d41c86fa3a800fb25552ac929a451eee Mon Sep 17 00:00:00 2001 From: Eugene Burkov Date: Mon, 11 Mar 2024 12:44:51 +0300 Subject: [PATCH] Pull request 328: Upd Go Squashed commit of the following: commit 79fd71bb4dfa277e67e04cfc7ae3165716c9417d Author: Eugene Burkov Date: Mon Mar 11 12:32:24 2024 +0300 all: upd go --- Makefile | 2 +- bamboo-specs/bamboo.yaml | 2 +- go.mod | 2 +- internal/tools/go.mod | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 60699d1d8..4b86b7158 100644 --- a/Makefile +++ b/Makefile @@ -24,7 +24,7 @@ BRANCH = $$( git rev-parse --abbrev-ref HEAD ) DIST_DIR = build GOAMD64 = v1 GOPROXY = https://goproxy.cn|https://proxy.golang.org|direct -GOTOOLCHAIN = go1.21.7 +GOTOOLCHAIN = go1.21.8 OUT = dnsproxy RACE = 0 REVISION = $$( git rev-parse --short HEAD ) diff --git a/bamboo-specs/bamboo.yaml b/bamboo-specs/bamboo.yaml index efec70f2b..c8c76b520 100644 --- a/bamboo-specs/bamboo.yaml +++ b/bamboo-specs/bamboo.yaml @@ -10,7 +10,7 @@ # exact patch version as opposed to a minor one to make sure that this exact # version is actually used and not whatever the docker daemon on the CI has # cached a few months ago. - 'dockerGo': 'golang:1.21.7' + 'dockerGo': 'golang:1.21.8' 'maintainer': 'Adguard Go Team' 'name': 'dnsproxy' diff --git a/go.mod b/go.mod index 0789873b7..ff726ae2a 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/AdguardTeam/dnsproxy -go 1.21.7 +go 1.21.8 require ( github.com/AdguardTeam/golibs v0.20.1 diff --git a/internal/tools/go.mod b/internal/tools/go.mod index 33e8143ea..a863cecaf 100644 --- a/internal/tools/go.mod +++ b/internal/tools/go.mod @@ -1,6 +1,6 @@ module github.com/AdguardTeam/dnsproxy/internal/tools -go 1.21.7 +go 1.21.8 require ( github.com/fzipp/gocyclo v0.6.0