Skip to content

Commit 95e7ffa

Browse files
EugeneOne1EugeneOne1
committed
Pull request #406: Update all
Merge in GO/dnsproxy from upd-all to master Squashed commit of the following: commit 5479b35 Author: Eugene Burkov <[email protected]> Date: Tue Aug 19 15:12:17 2025 +0300 all: export tests commit 8b1e941 Author: Eugene Burkov <[email protected]> Date: Tue Aug 19 14:24:07 2025 +0300 specs: upd build image commit fa7fd88 Author: Eugene Burkov <[email protected]> Date: Tue Aug 19 14:12:18 2025 +0300 all: gitignore commit f931ab0 Author: Eugene Burkov <[email protected]> Date: Tue Aug 19 14:05:20 2025 +0300 all: upd scripts commit bfba1bf Author: Eugene Burkov <[email protected]> Date: Tue Aug 19 13:40:14 2025 +0300 all: upd golibs commit 66f1891 Author: Eugene Burkov <[email protected]> Date: Tue Aug 19 12:55:09 2025 +0300 all: upd go & tools
1 parent 81793d5 commit 95e7ffa

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+385
-435
lines changed

‎.github/workflows/build.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: Build
22

33
'env':
4-
'GO_VERSION': '1.24.4'
4+
'GO_VERSION': '1.24.6'
55

66
'on':
77
'push':

‎.github/workflows/docker.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
'name': Docker
22

33
'env':
4-
'GO_VERSION': '1.24.4'
4+
'GO_VERSION': '1.24.6'
55

66
'on':
77
'push':

‎.github/workflows/lint.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
'name': 'lint'
22

33
'env':
4-
'GO_VERSION': '1.24.4'
4+
'GO_VERSION': '1.24.6'
55

66
'on':
77
'push':

‎.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,16 @@
66
#
77
# Only build, run, and test outputs here. Sorted. With negations at the
88
# bottom to make sure they take effect.
9+
*.exe
910
*.out
1011
*.test
1112
/bin/
13+
/tmp/
1214
build
1315
dnsproxy
1416
dnsproxy.exe
1517
example.crt
1618
example.key
1719
coverage.txt
1820
config.yaml
21+
test-reports/

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ DIST_DIR = build
2323
GOAMD64 = v1
2424
GOPROXY = https://proxy.golang.org|direct
2525
GOTELEMETRY = off
26-
GOTOOLCHAIN = go1.24.4
26+
GOTOOLCHAIN = go1.24.6
2727
OUT = dnsproxy
2828
RACE = 0
2929
REVISION = $${REVISION:-$$(git rev-parse --short HEAD)}

‎bamboo-specs/bamboo.yaml‎

Lines changed: 24 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
# exact patch version as opposed to a minor one to make sure that this exact
1111
# version is actually used and not whatever the docker daemon on the CI has
1212
# cached a few months ago.
13-
'dockerGo': 'golang:1.24.4'
13+
'dockerGo': 'adguard/go-builder:1.24.6--1'
1414
'maintainer': 'Adguard Go Team'
1515
'name': 'dnsproxy'
1616

@@ -45,6 +45,8 @@
4545
'interpreter': 'SHELL'
4646
'scripts':
4747
- |
48+
#!/bin/sh
49+
4850
set -e -f -u -x
4951
5052
make VERBOSE=1 GOMAXPROCS=1 go-tools go-lint
@@ -55,6 +57,13 @@
5557
'volumes':
5658
'${system.GO_CACHE_DIR}': '${bamboo.cacheGo}'
5759
'${system.GO_PKG_CACHE_DIR}': '${bamboo.cacheGoPkg}'
60+
'final-tasks':
61+
- 'test-parser':
62+
# The default pattern, '**/test-reports/*.xml', works, so don't set
63+
# the test-results property.
64+
'type': 'junit'
65+
'ignore-time': true
66+
- 'clean'
5867
'key': 'TEST'
5968
'other':
6069
'clean-working-dir': true
@@ -69,9 +78,22 @@
6978
# here as well.
7079
'scripts':
7180
- |
81+
#!/bin/sh
82+
7283
set -e -f -u -x
7384
74-
make VERBOSE=1 go-deps go-test
85+
make \
86+
GOMAXPROCS=1 \
87+
VERBOSE=1 \
88+
go-deps go-tools
89+
90+
make \
91+
TEST_REPORTS_DIR="./test-reports/" \
92+
VERBOSE=1 \
93+
go-test \
94+
;
95+
96+
exit "$(cat ./test-reports/test-exit-code.txt)"
7597
7698
'branches':
7799
'create': 'for-pull-request'

‎go.mod‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
module github.com/AdguardTeam/dnsproxy
22

3-
go 1.24.4
3+
go 1.24.6
44

55
require (
6-
github.com/AdguardTeam/golibs v0.32.15
6+
github.com/AdguardTeam/golibs v0.34.0
77
github.com/ameshkov/dnscrypt/v2 v2.4.0
88
github.com/ameshkov/dnsstamps v1.0.3
99
github.com/beefsack/go-rate v0.0.0-20220214233405-116f4ca011a0
@@ -14,19 +14,19 @@ require (
1414
// when TestUpstreamDoH_serverRestart/http3/second_try keeps failing.
1515
github.com/quic-go/quic-go v0.53.0
1616
github.com/stretchr/testify v1.10.0
17-
golang.org/x/exp v0.0.0-20250620022241-b7579e27df2b // indirect
18-
golang.org/x/net v0.41.0
19-
golang.org/x/sys v0.33.0
17+
golang.org/x/exp v0.0.0-20250813145105-42675adae3e6 // indirect
18+
golang.org/x/net v0.43.0
19+
golang.org/x/sys v0.35.0
2020
gonum.org/v1/gonum v0.16.0
2121
gopkg.in/yaml.v3 v3.0.1
2222
)
2323

2424
require (
25-
cloud.google.com/go v0.121.3 // indirect
25+
cloud.google.com/go v0.121.6 // indirect
2626
cloud.google.com/go/ai v0.12.1 // indirect
27-
cloud.google.com/go/auth v0.16.2 // indirect
27+
cloud.google.com/go/auth v0.16.5 // indirect
2828
cloud.google.com/go/auth/oauth2adapt v0.2.8 // indirect
29-
cloud.google.com/go/compute/metadata v0.7.0 // indirect
29+
cloud.google.com/go/compute/metadata v0.8.0 // indirect
3030
cloud.google.com/go/longrunning v0.6.7 // indirect
3131
github.com/BurntSushi/toml v1.5.0 // indirect
3232
github.com/ccojocar/zxcvbn-go v1.0.4 // indirect
@@ -42,7 +42,7 @@ require (
4242
github.com/google/s2a-go v0.1.9 // indirect
4343
github.com/google/uuid v1.6.0 // indirect
4444
github.com/googleapis/enterprise-certificate-proxy v0.3.6 // indirect
45-
github.com/googleapis/gax-go/v2 v2.14.2 // indirect
45+
github.com/googleapis/gax-go/v2 v2.15.0 // indirect
4646
github.com/gookit/color v1.5.4 // indirect
4747
github.com/gordonklaus/ineffassign v0.1.0 // indirect
4848
github.com/jstemmer/go-junit-report/v2 v2.1.0 // indirect
@@ -51,7 +51,7 @@ require (
5151
github.com/quic-go/qpack v0.5.1 // indirect
5252
github.com/robfig/cron/v3 v3.0.1 // indirect
5353
github.com/rogpeppe/go-internal v1.14.1 // indirect
54-
github.com/securego/gosec/v2 v2.22.5 // indirect
54+
github.com/securego/gosec/v2 v2.22.8 // indirect
5555
github.com/uudashr/gocognit v1.2.0 // indirect
5656
github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect
5757
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
@@ -61,26 +61,26 @@ require (
6161
go.opentelemetry.io/otel/metric v1.37.0 // indirect
6262
go.opentelemetry.io/otel/trace v1.37.0 // indirect
6363
go.uber.org/mock v0.5.2 // indirect
64-
golang.org/x/crypto v0.39.0 // indirect
65-
golang.org/x/exp/typeparams v0.0.0-20250620022241-b7579e27df2b // indirect
66-
golang.org/x/mod v0.25.0 // indirect
64+
golang.org/x/crypto v0.41.0 // indirect
65+
golang.org/x/exp/typeparams v0.0.0-20250813145105-42675adae3e6 // indirect
66+
golang.org/x/mod v0.27.0 // indirect
6767
golang.org/x/oauth2 v0.30.0 // indirect
68-
golang.org/x/sync v0.15.0 // indirect
69-
golang.org/x/telemetry v0.0.0-20250624183230-fef9409b2ec8 // indirect
70-
golang.org/x/term v0.32.0 // indirect
71-
golang.org/x/text v0.26.0 // indirect
68+
golang.org/x/sync v0.16.0 // indirect
69+
golang.org/x/telemetry v0.0.0-20250818163834-19f67fecc6ff // indirect
70+
golang.org/x/term v0.34.0 // indirect
71+
golang.org/x/text v0.28.0 // indirect
7272
golang.org/x/time v0.12.0 // indirect
73-
golang.org/x/tools v0.34.0 // indirect
73+
golang.org/x/tools v0.36.0 // indirect
7474
golang.org/x/vuln v1.1.4 // indirect
75-
google.golang.org/api v0.239.0 // indirect
76-
google.golang.org/genproto/googleapis/api v0.0.0-20250603155806-513f23925822 // indirect
77-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250603155806-513f23925822 // indirect
78-
google.golang.org/grpc v1.73.0 // indirect
79-
google.golang.org/protobuf v1.36.6 // indirect
75+
google.golang.org/api v0.247.0 // indirect
76+
google.golang.org/genproto/googleapis/api v0.0.0-20250818200422-3122310a409c // indirect
77+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250818200422-3122310a409c // indirect
78+
google.golang.org/grpc v1.74.2 // indirect
79+
google.golang.org/protobuf v1.36.7 // indirect
8080
honnef.co/go/tools v0.6.1 // indirect
8181
mvdan.cc/editorconfig v0.3.0 // indirect
8282
mvdan.cc/gofumpt v0.8.0 // indirect
83-
mvdan.cc/sh/v3 v3.11.0 // indirect
83+
mvdan.cc/sh/v3 v3.12.0 // indirect
8484
mvdan.cc/unparam v0.0.0-20250301125049-0df0534333a4 // indirect
8585
)
8686

0 commit comments

Comments
 (0)