Skip to content

Commit 690121b

Browse files
committed
Pull request 392: Update Go & skel
Merge in GO/dnsproxy from upd-go to master Squashed commit of the following: commit f1b4491 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Mar 10 15:34:25 2025 +0300 scripts: imp fmt again commit d7ea50a Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Mar 10 15:04:12 2025 +0300 all: imp docs, fmt commit 2c44c7e Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Mar 10 14:30:56 2025 +0300 all: upd benches commit ef2e147 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Mar 10 14:10:38 2025 +0300 all: upd skel
1 parent 674acec commit 690121b

28 files changed

+769
-842
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.23.6'
4+
'GO_VERSION': '1.24.1'
55

66
'on':
77
'push':

.github/workflows/docker.yml

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

33
'env':
4-
'GO_VERSION': '1.23.6'
4+
'GO_VERSION': '1.24.1'
55

66
'on':
77
'push':
@@ -24,7 +24,7 @@
2424
'with':
2525
'go-version': '${{ env.GO_VERSION }}'
2626
- 'name': 'Set up Go modules cache'
27-
'uses': 'actions/cache@v2'
27+
'uses': 'actions/cache@v4'
2828
'with':
2929
'path': '~/go/pkg/mod'
3030
'key': "${{ runner.os }}-go-${{ hashFiles('go.sum') }}"

.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.23.6'
4+
'GO_VERSION': '1.24.1'
55

66
'on':
77
'push':

.markdownlint.json

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
{
2+
"ul-indent": {
3+
"indent": 4
4+
},
5+
"ul-style": {
6+
"style": "dash"
7+
},
8+
"emphasis-style": {
9+
"style": "asterisk"
10+
},
11+
"no-duplicate-heading": {
12+
"siblings_only": true
13+
},
14+
"no-inline-html": {
15+
"allowed_elements": [
16+
"a"
17+
]
18+
},
19+
"no-trailing-spaces": {
20+
"br_spaces": 0
21+
},
22+
"line-length": false,
23+
"no-bare-urls": false,
24+
"link-fragments": false
25+
}

Makefile

Lines changed: 13 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
#
1110
# AdGuard-Project-Version: 9
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}
@@ -24,8 +22,8 @@ BRANCH = $${BRANCH:-$$(git rev-parse --abbrev-ref HEAD)}
2422
DIST_DIR = build
2523
GOAMD64 = v1
2624
GOPROXY = https://proxy.golang.org|direct
27-
GOTOOLCHAIN = go1.23.6
2825
GOTELEMETRY = off
26+
GOTOOLCHAIN = go1.24.1
2927
OUT = dnsproxy
3028
RACE = 0
3129
REVISION = $${REVISION:-$$(git rev-parse --short HEAD)}
@@ -54,8 +52,7 @@ ENV_MISC = env\
5452

5553
# Keep the line above blank.
5654

57-
# Keep this target first, so that a naked make invocation triggers a
58-
# full build.
55+
# Keep this target first, so that a naked make invocation triggers a full build.
5956
build: go-deps go-build
6057

6158
init: ; git config core.hooksPath ./scripts/hooks
@@ -83,10 +80,10 @@ go-os-check:
8380

8481
txt-lint: ; $(ENV) "$(SHELL)" ./scripts/make/txt-lint.sh
8582

86-
md-lint: ; $(ENV_MISC) "$(SHELL)" ./scripts/make/md-lint.sh
87-
sh-lint: ; $(ENV_MISC) "$(SHELL)" ./scripts/make/sh-lint.sh
83+
md-lint: ; $(ENV_MISC) "$(SHELL)" ./scripts/make/md-lint.sh
84+
sh-lint: ; $(ENV_MISC) "$(SHELL)" ./scripts/make/sh-lint.sh
8885

89-
clean: ; $(ENV) $(GO.MACRO) clean && rm -f -r '$(DIST_DIR)'
86+
clean: ; $(ENV) $(GO.MACRO) clean && rm -f -r '$(DIST_DIR)'
9087

9188
release: clean
9289
$(ENV) "$(SHELL)" ./scripts/make/build-release.sh

0 commit comments

Comments
 (0)