Skip to content

Commit 5a0279e

Browse files
schzhnschzhn
committed
Pull request 84: upd-all
Merge in GO/adguarddnsclient from upd-all to master Squashed commit of the following: commit e580ec0 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Thu Sep 18 15:53:37 2025 +0300 bamboo-specs: fix typo commit 0bce257 Author: Stanislav Chzhen <s.chzhen@adguard.com> Date: Thu Sep 18 14:52:13 2025 +0300 all: upd all
1 parent 6490510 commit 5a0279e

File tree

11 files changed

+227
-191
lines changed

11 files changed

+227
-191
lines changed

‎.github/workflows/build.yml‎

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.5'
4+
'GO_VERSION': '1.25.1'
55

66
'on':
77
'push':

‎.github/workflows/lint.yml‎

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.5'
4+
'GO_VERSION': '1.25.1'
55

66
'on':
77
'push':

‎.gitignore‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# This comment is used to simplify checking local copies of the file. Bump
22
# this number every time a significant change is made to this file.
33
#
4-
# AdGuard-Project-Version: 1
4+
# AdGuard-Project-Version: 3
55

66
# Please, DO NOT put your text editors' temporary files here. The more are
77
# added, the harder it gets to maintain and manage projects' gitignores. Put
@@ -11,6 +11,7 @@
1111
#
1212
# Only build, run, and test outputs here. Sorted. With negations at the
1313
# bottom to make sure they take effect.
14+
*.exe
1415
*.out
1516
*.test
1617
/bin/

‎Makefile‎

Lines changed: 22 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,18 @@
1-
# Keep the Makefile POSIX-compliant. We currently allow hyphens in
2-
# target names, but that may change in the future.
1+
# Keep the Makefile POSIX-compliant. We currently allow hyphens in target
2+
# names, but that may change in the future.
33
#
44
# See https://pubs.opengroup.org/onlinepubs/9799919799/utilities/make.html.
55
.POSIX:
66

7-
# This comment is used to simplify checking local copies of the
8-
# Makefile. Bump this number every time a significant change is made to
9-
# this Makefile.
7+
# This comment is used to simplify checking local copies of the Makefile. Bump
8+
# this number every time a significant change is made to this Makefile.
109
#
11-
# AdGuard-Project-Version: 9
10+
# AdGuard-Project-Version: 11
1211

13-
# Don't name these macros "GO" etc., because GNU Make apparently makes
14-
# them exported environment variables with the literal value of
15-
# "${GO:-go}" and so on, which is not what we need. Use a dot in the
16-
# name to make sure that users don't have an environment variable with
17-
# the same name.
12+
# Don't name these macros "GO" etc., because GNU Make apparently makes them
13+
# exported environment variables with the literal value of "${GO:-go}" and so
14+
# on, which is not what we need. Use a dot in the name to make sure that users
15+
# don't have an environment variable with the same name.
1816
#
1917
# See https://unix.stackexchange.com/q/646255/105635.
2018
GO.MACRO = $${GO:-go}
@@ -27,7 +25,7 @@ DIST_DIR = dist
2725
GOAMD64 = v1
2826
GOPROXY = https://proxy.golang.org|direct
2927
GOTELEMETRY = off
30-
GOTOOLCHAIN = go1.24.5
28+
GOTOOLCHAIN = go1.25.1
3129
GPG_KEY = devteam@adguard.com
3230
GPG_KEY_PASSPHRASE = not-a-real-password
3331
MSI = 1
@@ -66,14 +64,17 @@ ENV_MISC = env\
6664

6765
# Keep the line above blank.
6866

69-
# Keep this target first, so that a naked make invocation triggers a
70-
# full build.
67+
# Keep this target first, so that a naked make invocation triggers a full build.
68+
.PHONY: build
7169
build: go-deps go-build
7270

71+
.PHONY: init
7372
init: ; git config core.hooksPath ./scripts/hooks
7473

74+
.PHONY: test
7575
test: go-test
7676

77+
.PHONY: go-build go-deps go-env go-lint go-test go-tools go-upd-tools
7778
go-build: ; $(ENV) "$(SHELL)" ./scripts/make/go-build.sh
7879
go-deps: ; $(ENV) "$(SHELL)" ./scripts/make/go-deps.sh
7980
go-env: ; $(ENV) "$(GO.MACRO)" env
@@ -82,18 +83,23 @@ go-test: ; $(ENV) RACE='1' "$(SHELL)" ./scripts/make/go-test.sh
8283
go-tools: ; $(ENV) "$(SHELL)" ./scripts/make/go-tools.sh
8384
go-upd-tools: ; $(ENV) "$(SHELL)" ./scripts/make/go-upd-tools.sh
8485

86+
.PHONY: go-check
8587
go-check: go-tools go-lint go-test
8688

8789
# A quick check to make sure that all operating systems relevant to the
8890
# development of the project can be typechecked and built successfully.
91+
.PHONY: go-os-check
8992
go-os-check:
9093
$(ENV) GOOS='darwin' "$(GO.MACRO)" vet ./internal/...
9194
$(ENV) GOOS='linux' "$(GO.MACRO)" vet ./internal/...
9295
$(ENV) GOOS='windows' "$(GO.MACRO)" vet ./internal/...
9396

97+
.PHONY: txt-lint
9498
txt-lint: ; $(ENV) "$(SHELL)" ./scripts/make/txt-lint.sh
9599

100+
.PHONY: build-release
96101
build-release: ; $(ENV) "$(SHELL)" ./scripts/make/build-release.sh
97102

98-
md-lint: ; $(ENV_MISC) "$(SHELL)" ./scripts/make/md-lint.sh
99-
sh-lint: ; $(ENV_MISC) "$(SHELL)" ./scripts/make/sh-lint.sh
103+
.PHONY: md-lint sh-lint
104+
md-lint: ; $(ENV_MISC) "$(SHELL)" ./scripts/make/md-lint.sh
105+
sh-lint: ; $(ENV_MISC) "$(SHELL)" ./scripts/make/sh-lint.sh

‎bamboo-specs/bamboo.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
'key': 'DNSCLIENT'
1010
'name': 'AdGuardDNSClient'
1111
'variables':
12-
'dockerGo': 'adguard/go-builder:1.24.5--2'
12+
'dockerGo': 'adguard/go-builder:1.25.1--1'
1313
'maintainer': 'Adguard Go Team'
1414
'name': 'AdGuardDNSClient'
1515
'channel': 'development'
@@ -355,7 +355,7 @@
355355
# "candidate" pseudo-channel is used to generate version.
356356
- '^rc-v[0-9]+\.[0-9]+\.[0-9]+':
357357
'variables':
358-
'dockerGo': 'adguard/go-builder:1.24.5--2'
358+
'dockerGo': 'adguard/go-builder:1.25.1--1'
359359
'channel': 'candidate'
360360
'stages':
361361
- 'Go Lint':
@@ -386,7 +386,7 @@
386386
# Set the default release channel on the final branch to release, as
387387
# these are the ones that actually get released.
388388
'variables':
389-
'dockerGo': 'adguard/go-builder:1.24.5--2'
389+
'dockerGo': 'adguard/go-builder:1.25.1--1'
390390
'channel': 'release'
391391
'stages':
392392
- 'Go Lint':

‎go.mod‎

Lines changed: 46 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
11
module github.com/AdguardTeam/AdGuardDNSClient
22

3-
go 1.24.5
3+
go 1.25.1
44

55
require (
66
github.com/AdguardTeam/dnsproxy v0.76.1
7-
github.com/AdguardTeam/golibs v0.33.0
7+
github.com/AdguardTeam/golibs v0.34.1
88
github.com/c2h5oh/datasize v0.0.0-20231215233829-aa82cc1e6500
99
github.com/google/renameio/v2 v2.0.0
10-
github.com/kardianos/service v1.2.2
11-
github.com/miekg/dns v1.1.66
12-
github.com/stretchr/testify v1.10.0
13-
golang.org/x/sys v0.34.0
10+
github.com/kardianos/service v1.2.4
11+
github.com/miekg/dns v1.1.68
12+
github.com/stretchr/testify v1.11.1
13+
golang.org/x/sys v0.36.0
1414
gopkg.in/yaml.v3 v3.0.1
1515
)
1616

1717
require (
18-
cloud.google.com/go v0.121.4 // indirect
18+
cloud.google.com/go v0.122.0 // indirect
1919
cloud.google.com/go/ai v0.12.1 // indirect
20-
cloud.google.com/go/auth v0.16.3 // indirect
20+
cloud.google.com/go/auth v0.16.5 // indirect
2121
cloud.google.com/go/auth/oauth2adapt v0.2.8 // indirect
22-
cloud.google.com/go/compute/metadata v0.7.0 // indirect
22+
cloud.google.com/go/compute/metadata v0.8.3 // indirect
2323
cloud.google.com/go/longrunning v0.6.7 // indirect
2424
github.com/BurntSushi/toml v1.5.0 // indirect
2525
github.com/ameshkov/dnscrypt/v2 v2.4.0 // indirect
@@ -39,52 +39,60 @@ require (
3939
github.com/google/uuid v1.6.0 // indirect
4040
github.com/googleapis/enterprise-certificate-proxy v0.3.6 // indirect
4141
github.com/googleapis/gax-go/v2 v2.15.0 // indirect
42-
github.com/gookit/color v1.5.4 // indirect
43-
github.com/gordonklaus/ineffassign v0.1.0 // indirect
42+
github.com/gookit/color v1.6.0 // indirect
43+
github.com/gordonklaus/ineffassign v0.2.0 // indirect
4444
github.com/jstemmer/go-junit-report/v2 v2.1.0 // indirect
4545
github.com/kisielk/errcheck v1.9.0 // indirect
4646
github.com/patrickmn/go-cache v2.1.0+incompatible // indirect
4747
github.com/pmezard/go-difflib v1.0.0 // indirect
4848
github.com/quic-go/qpack v0.5.1 // indirect
49-
github.com/quic-go/quic-go v0.53.0 // indirect
49+
github.com/quic-go/quic-go v0.54.0 // indirect
5050
github.com/robfig/cron/v3 v3.0.1 // indirect
5151
github.com/rogpeppe/go-internal v1.14.1 // indirect
52-
github.com/securego/gosec/v2 v2.22.7 // indirect
52+
github.com/securego/gosec/v2 v2.22.8 // indirect
5353
github.com/uudashr/gocognit v1.2.0 // indirect
5454
github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect
55-
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
56-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.62.0 // indirect
57-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.62.0 // indirect
58-
go.opentelemetry.io/otel v1.37.0 // indirect
59-
go.opentelemetry.io/otel/metric v1.37.0 // indirect
60-
go.opentelemetry.io/otel/trace v1.37.0 // indirect
61-
go.uber.org/mock v0.5.2 // indirect
62-
golang.org/x/crypto v0.40.0 // indirect
63-
golang.org/x/exp v0.0.0-20250718183923-645b1fa84792 // indirect
64-
golang.org/x/exp/typeparams v0.0.0-20250718183923-645b1fa84792 // indirect
65-
golang.org/x/mod v0.26.0 // indirect
66-
golang.org/x/net v0.42.0 // indirect
67-
golang.org/x/oauth2 v0.30.0 // indirect
68-
golang.org/x/sync v0.16.0 // indirect
69-
golang.org/x/telemetry v0.0.0-20250729135900-28f32e417a03 // indirect
70-
golang.org/x/term v0.33.0 // indirect
71-
golang.org/x/text v0.27.0 // indirect
72-
golang.org/x/time v0.12.0 // indirect
73-
golang.org/x/tools v0.35.0 // indirect
55+
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
56+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.63.0 // indirect
57+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0 // indirect
58+
go.opentelemetry.io/otel v1.38.0 // indirect
59+
go.opentelemetry.io/otel/metric v1.38.0 // indirect
60+
go.opentelemetry.io/otel/trace v1.38.0 // indirect
61+
go.uber.org/mock v0.6.0 // indirect
62+
golang.org/x/crypto v0.42.0 // indirect
63+
golang.org/x/exp v0.0.0-20250911091902-df9299821621 // indirect
64+
golang.org/x/exp/typeparams v0.0.0-20250911091902-df9299821621 // indirect
65+
golang.org/x/mod v0.28.0 // indirect
66+
golang.org/x/net v0.44.0 // indirect
67+
golang.org/x/oauth2 v0.31.0 // indirect
68+
golang.org/x/sync v0.17.0 // indirect
69+
golang.org/x/telemetry v0.0.0-20250908211612-aef8a434d053 // indirect
70+
golang.org/x/term v0.35.0 // indirect
71+
golang.org/x/text v0.29.0 // indirect
72+
golang.org/x/time v0.13.0 // indirect
73+
golang.org/x/tools v0.37.0 // indirect
7474
golang.org/x/vuln v1.1.4 // indirect
7575
gonum.org/v1/gonum v0.16.0 // indirect
76-
google.golang.org/api v0.244.0 // indirect
77-
google.golang.org/genproto/googleapis/api v0.0.0-20250804133106-a7a43d27e69b // indirect
78-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250804133106-a7a43d27e69b // indirect
79-
google.golang.org/grpc v1.74.2 // indirect
80-
google.golang.org/protobuf v1.36.6 // indirect
76+
google.golang.org/api v0.249.0 // indirect
77+
google.golang.org/genproto v0.0.0-20250908214217-97024824d090 // indirect
78+
google.golang.org/genproto/googleapis/api v0.0.0-20250908214217-97024824d090 // indirect
79+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250908214217-97024824d090 // indirect
80+
google.golang.org/grpc v1.75.1 // indirect
81+
google.golang.org/protobuf v1.36.9 // indirect
8182
honnef.co/go/tools v0.6.1 // indirect
8283
mvdan.cc/editorconfig v0.3.0 // indirect
83-
mvdan.cc/gofumpt v0.8.0 // indirect
84+
mvdan.cc/gofumpt v0.9.1 // indirect
8485
mvdan.cc/sh/v3 v3.12.0 // indirect
8586
mvdan.cc/unparam v0.0.0-20250301125049-0df0534333a4 // indirect
8687
)
8788

89+
// NOTE: Keep in sync with .gitignore.
90+
ignore (
91+
./bin
92+
./dist
93+
./test-reports
94+
)
95+
8896
tool (
8997
github.com/fzipp/gocyclo/cmd/gocyclo
9098
github.com/golangci/misspell/cmd/misspell

0 commit comments

Comments
 (0)