Merge branch 'master' into proxy-constructor

AdguardTeam · Mar 11, 2024 · 5f32dae · 5f32dae
2 parents 7be550b + 2536131
commit 5f32dae
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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