Skip to content

Commit 47fce68

Browse files
dssengdsseng
committed
feat: support Go 1.26, rekres
Also update dependencies (x/net) Signed-off-by: Dmitrii Sharshakov <dmitry.sharshakov@siderolabs.com>
1 parent d51e25a commit 47fce68

File tree

15 files changed

+91
-45
lines changed

15 files changed

+91
-45
lines changed

‎.conform.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT.
22
#
3-
# Generated on 2025-08-19T12:07:57Z by kres d1ef768.
3+
# Generated on 2026-02-12T17:24:59Z by kres 84d286e.
44

55
policies:
66
- type: commit
@@ -12,7 +12,7 @@ policies:
1212
gitHubOrganization: siderolabs
1313
spellcheck:
1414
locale: US
15-
maximumOfOneCommit: true
15+
maximumOfOneCommit: false
1616
header:
1717
length: 89
1818
imperative: true

‎.dockerignore‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT.
22
#
3-
# Generated on 2025-08-19T12:05:47Z by kres d1ef768.
3+
# Generated on 2026-02-12T17:24:59Z by kres 84d286e.
44

55
*
66
!internal
@@ -15,6 +15,7 @@
1515
!debug_on_124.go
1616
!debug_on_124_test.go
1717
!debug_on_125_test.go
18+
!debug_on_126_test.go
1819
!race_off.go
1920
!race_on.go
2021
!go.mod

‎.github/workflows/ci.yaml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT.
22
#
3-
# Generated on 2025-10-08T09:20:50Z by kres 063080a.
3+
# Generated on 2026-02-12T17:24:59Z by kres 84d286e.
44

55
concurrency:
66
group: ${{ github.head_ref || github.run_id }}
@@ -31,7 +31,7 @@ jobs:
3131
steps:
3232
- name: gather-system-info
3333
id: system-info
34-
uses: kenchan0130/actions-system-info@v1.4.0
34+
uses: kenchan0130/actions-system-info@59699597e84e80085a750998045983daa49274c4 # version: v1.4.0
3535
continue-on-error: true
3636
- name: print-system-info
3737
run: |
@@ -55,13 +55,13 @@ jobs:
5555
done
5656
continue-on-error: true
5757
- name: checkout
58-
uses: actions/checkout@v5
58+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # version: v6.0.2
5959
- name: Unshallow
6060
run: |
6161
git fetch --prune --unshallow
6262
- name: Set up Docker Buildx
6363
id: setup-buildx
64-
uses: docker/setup-buildx-action@v3
64+
uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # version: v3.12.0
6565
with:
6666
driver: remote
6767
endpoint: tcp://buildkit-amd64.ci.svc.cluster.local:1234
@@ -75,7 +75,7 @@ jobs:
7575
make release-notes
7676
- name: Release
7777
if: startsWith(github.ref, 'refs/tags/')
78-
uses: softprops/action-gh-release@v2
78+
uses: softprops/action-gh-release@a06a81a03ee405af7f2048a818ed3f03bbf83c7b # version: v2.5.0
7979
with:
8080
body_path: _out/RELEASE_NOTES.md
8181
draft: "true"
@@ -88,7 +88,7 @@ jobs:
8888
steps:
8989
- name: gather-system-info
9090
id: system-info
91-
uses: kenchan0130/actions-system-info@v1.4.0
91+
uses: kenchan0130/actions-system-info@59699597e84e80085a750998045983daa49274c4 # version: v1.4.0
9292
continue-on-error: true
9393
- name: print-system-info
9494
run: |
@@ -112,13 +112,13 @@ jobs:
112112
done
113113
continue-on-error: true
114114
- name: checkout
115-
uses: actions/checkout@v5
115+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # version: v6.0.2
116116
- name: Unshallow
117117
run: |
118118
git fetch --prune --unshallow
119119
- name: Set up Docker Buildx
120120
id: setup-buildx
121-
uses: docker/setup-buildx-action@v3
121+
uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # version: v3.12.0
122122
with:
123123
driver: remote
124124
endpoint: tcp://buildkit-amd64.ci.svc.cluster.local:1234
@@ -135,7 +135,7 @@ jobs:
135135
steps:
136136
- name: gather-system-info
137137
id: system-info
138-
uses: kenchan0130/actions-system-info@v1.4.0
138+
uses: kenchan0130/actions-system-info@59699597e84e80085a750998045983daa49274c4 # version: v1.4.0
139139
continue-on-error: true
140140
- name: print-system-info
141141
run: |
@@ -159,13 +159,13 @@ jobs:
159159
done
160160
continue-on-error: true
161161
- name: checkout
162-
uses: actions/checkout@v5
162+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # version: v6.0.2
163163
- name: Unshallow
164164
run: |
165165
git fetch --prune --unshallow
166166
- name: Set up Docker Buildx
167167
id: setup-buildx
168-
uses: docker/setup-buildx-action@v3
168+
uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # version: v3.12.0
169169
with:
170170
driver: remote
171171
endpoint: tcp://buildkit-amd64.ci.svc.cluster.local:1234
@@ -177,7 +177,7 @@ jobs:
177177
run: |
178178
make unit-tests-race
179179
- name: coverage
180-
uses: codecov/codecov-action@v5
180+
uses: codecov/codecov-action@671740ac38dd9b0130fbe1cec585b89eea48d3de # version: v5.5.2
181181
with:
182182
files: _out/coverage-unit-tests.txt
183183
flags: unit-tests

‎.github/workflows/lock.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT.
22
#
3-
# Generated on 2025-08-19T10:19:30Z by kres ff3b493.
3+
# Generated on 2026-02-12T17:24:59Z by kres 84d286e.
44

55
"on":
66
schedule:
@@ -14,7 +14,7 @@ jobs:
1414
- ubuntu-latest
1515
steps:
1616
- name: Lock old issues
17-
uses: dessant/lock-threads@v5.0.1
17+
uses: dessant/lock-threads@7266a7ce5c1df01b1c6db85bf8cd86c737dadbe7 # version: v6.0.0
1818
with:
1919
issue-inactive-days: "60"
2020
log-output: "true"

‎.github/workflows/slack-notify-ci-failure.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT.
22
#
3-
# Generated on 2025-10-08T09:20:50Z by kres 063080a.
3+
# Generated on 2026-02-12T17:24:59Z by kres 84d286e.
44

55
"on":
66
workflow_run:
@@ -18,7 +18,7 @@ jobs:
1818
if: github.event.workflow_run.conclusion == 'failure' && github.event.workflow_run.event != 'pull_request'
1919
steps:
2020
- name: Slack Notify
21-
uses: slackapi/slack-github-action@v2
21+
uses: slackapi/slack-github-action@91efab103c0de0a537f72a35f6b8cda0ee76bf0a # version: v2.1.1
2222
with:
2323
method: chat.postMessage
2424
payload: |

‎.github/workflows/slack-notify.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT.
22
#
3-
# Generated on 2025-10-08T09:20:50Z by kres 063080a.
3+
# Generated on 2026-02-12T17:24:59Z by kres 84d286e.
44

55
"on":
66
workflow_run:
@@ -23,7 +23,7 @@ jobs:
2323
run: |
2424
echo pull_request_number=$(gh pr view -R ${{ github.repository }} ${{ github.event.workflow_run.head_repository.owner.login }}:${{ github.event.workflow_run.head_branch }} --json number --jq .number) >> $GITHUB_OUTPUT
2525
- name: Slack Notify
26-
uses: slackapi/slack-github-action@v2
26+
uses: slackapi/slack-github-action@91efab103c0de0a537f72a35f6b8cda0ee76bf0a # version: v2.1.1
2727
with:
2828
method: chat.postMessage
2929
payload: |

‎.github/workflows/stale.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT.
22
#
3-
# Generated on 2025-10-08T09:20:50Z by kres 063080a.
3+
# Generated on 2026-02-12T17:24:59Z by kres 84d286e.
44

55
"on":
66
schedule:
@@ -15,7 +15,7 @@ jobs:
1515
- ubuntu-latest
1616
steps:
1717
- name: Close stale issues and PRs
18-
uses: actions/stale@v10.1.0
18+
uses: actions/stale@997185467fa4f803885201cee163a9f38240193d # version: v10.1.1
1919
with:
2020
close-issue-message: This issue was closed because it has been stalled for 7 days with no activity.
2121
days-before-issue-close: "5"

‎.golangci.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT.
22
#
3-
# Generated on 2025-08-19T10:19:30Z by kres ff3b493.
3+
# Generated on 2026-02-12T17:24:59Z by kres 84d286e.
44

55
version: "2"
66

@@ -9,6 +9,7 @@ run:
99
modules-download-mode: readonly
1010
issues-exit-code: 1
1111
tests: true
12+
build-tags: []
1213

1314
# output configuration options
1415
output:

‎Dockerfile‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
1-
# syntax = docker/dockerfile-upstream:1.19.0-labs
1+
# syntax = docker/dockerfile-upstream:1.21.0-labs
22

33
# THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT.
44
#
5-
# Generated on 2025-10-08T09:20:50Z by kres 063080a.
5+
# Generated on 2026-02-12T17:24:59Z by kres 84d286e.
66

7-
ARG TOOLCHAIN
7+
ARG TOOLCHAIN=scratch
88

99
# runs markdownlint
10-
FROM docker.io/oven/bun:1.2.23-alpine AS lint-markdown
10+
FROM docker.io/oven/bun:1.3.9-alpine AS lint-markdown
1111
WORKDIR /src
12-
RUN bun i markdownlint-cli@0.45.0 sentences-per-line@0.3.0
12+
RUN bun i markdownlint-cli@0.47.0 sentences-per-line@0.5.1
1313
COPY .markdownlint.json .
1414
COPY ./README.md ./README.md
15-
RUN bunx markdownlint --ignore "CHANGELOG.md" --ignore "**/node_modules/**" --ignore '**/hack/chglog/**' --rules sentences-per-line .
15+
RUN bunx markdownlint --ignore "CHANGELOG.md" --ignore "**/node_modules/**" --ignore '**/hack/chglog/**' --rules markdownlint-sentences-per-line .
1616

1717
# base toolchain image
1818
FROM --platform=${BUILDPLATFORM} ${TOOLCHAIN} AS toolchain
@@ -60,6 +60,7 @@ COPY ./debug_on_123_test.go ./debug_on_123_test.go
6060
COPY ./debug_on_124.go ./debug_on_124.go
6161
COPY ./debug_on_124_test.go ./debug_on_124_test.go
6262
COPY ./debug_on_125_test.go ./debug_on_125_test.go
63+
COPY ./debug_on_126_test.go ./debug_on_126_test.go
6364
COPY ./race_off.go ./race_off.go
6465
COPY ./race_on.go ./race_on.go
6566
RUN --mount=type=cache,target=/go/pkg,id=go-debug/go/pkg go list -mod=readonly all >/dev/null

‎Makefile‎

Lines changed: 23 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,40 @@
11
# THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT.
22
#
3-
# Generated on 2025-10-08T09:20:50Z by kres 063080a.
3+
# Generated on 2026-02-12T17:24:59Z by kres 84d286e.
44

55
# common variables
66

77
SHA := $(shell git describe --match=none --always --abbrev=8 --dirty)
88
TAG := $(shell git describe --tag --always --dirty --match v[0-9]\*)
9+
TAG_SUFFIX ?=
910
ABBREV_TAG := $(shell git describe --tags >/dev/null 2>/dev/null && git describe --tag --always --match v[0-9]\* --abbrev=0 || echo 'undefined')
1011
BRANCH := $(shell git rev-parse --abbrev-ref HEAD)
1112
ARTIFACTS := _out
12-
IMAGE_TAG ?= $(TAG)
13+
IMAGE_TAG ?= $(TAG)$(TAG_SUFFIX)
1314
OPERATING_SYSTEM := $(shell uname -s | tr '[:upper:]' '[:lower:]')
1415
GOARCH := $(shell uname -m | sed 's/x86_64/amd64/' | sed 's/aarch64/arm64/')
1516
WITH_DEBUG ?= false
1617
WITH_RACE ?= false
1718
REGISTRY ?= ghcr.io
1819
USERNAME ?= siderolabs
1920
REGISTRY_AND_USERNAME ?= $(REGISTRY)/$(USERNAME)
20-
PROTOBUF_GO_VERSION ?= 1.36.10
21-
GRPC_GO_VERSION ?= 1.5.1
22-
GRPC_GATEWAY_VERSION ?= 2.27.3
21+
PROTOBUF_GO_VERSION ?= 1.36.11
22+
GRPC_GO_VERSION ?= 1.6.1
23+
GRPC_GATEWAY_VERSION ?= 2.27.8
2324
VTPROTOBUF_VERSION ?= 0.6.0
24-
GOIMPORTS_VERSION ?= 0.37.0
25+
GOIMPORTS_VERSION ?= 0.42.0
2526
GOMOCK_VERSION ?= 0.6.0
2627
DEEPCOPY_VERSION ?= v0.5.8
27-
GOLANGCILINT_VERSION ?= v2.5.0
28-
GOFUMPT_VERSION ?= v0.9.1
29-
GO_VERSION ?= 1.25.2
28+
GOLANGCILINT_VERSION ?= v2.9.0
29+
GOFUMPT_VERSION ?= v0.9.2
30+
GO_VERSION ?= 1.26.0
3031
GO_BUILDFLAGS ?=
32+
GO_BUILDTAGS ?= ,
3133
GO_LDFLAGS ?=
3234
CGO_ENABLED ?= 0
3335
GOTOOLCHAIN ?= local
3436
GOEXPERIMENT ?=
37+
GO_BUILDFLAGS += -tags $(GO_BUILDTAGS)
3538
TESTPKGS ?= ./...
3639
KRES_IMAGE ?= ghcr.io/siderolabs/kres:latest
3740
CONFORMANCE_IMAGE ?= ghcr.io/siderolabs/conform:latest
@@ -43,6 +46,7 @@ PLATFORM ?= linux/amd64
4346
PROGRESS ?= auto
4447
PUSH ?= false
4548
CI_ARGS ?=
49+
WITH_BUILD_DEBUG ?=
4650
BUILDKIT_MULTI_PLATFORM ?=
4751
COMMON_ARGS = --file=Dockerfile
4852
COMMON_ARGS += --provenance=false
@@ -72,7 +76,7 @@ COMMON_ARGS += --build-arg=DEEPCOPY_VERSION="$(DEEPCOPY_VERSION)"
7276
COMMON_ARGS += --build-arg=GOLANGCILINT_VERSION="$(GOLANGCILINT_VERSION)"
7377
COMMON_ARGS += --build-arg=GOFUMPT_VERSION="$(GOFUMPT_VERSION)"
7478
COMMON_ARGS += --build-arg=TESTPKGS="$(TESTPKGS)"
75-
TOOLCHAIN ?= docker.io/golang:1.25-alpine
79+
TOOLCHAIN ?= docker.io/golang:1.26-alpine
7680

7781
# help menu
7882

@@ -124,14 +128,18 @@ respectively.
124128

125129
endef
126130

131+
ifneq (, $(filter $(WITH_BUILD_DEBUG), t true TRUE y yes 1))
132+
BUILD := BUILDX_EXPERIMENTAL=1 docker buildx debug --invoke /bin/sh --on error build
133+
endif
134+
127135
ifneq (, $(filter $(WITH_RACE), t true TRUE y yes 1))
128136
GO_BUILDFLAGS += -race
129137
CGO_ENABLED := 1
130138
GO_LDFLAGS += -linkmode=external -extldflags '-static'
131139
endif
132140

133141
ifneq (, $(filter $(WITH_DEBUG), t true TRUE y yes 1))
134-
GO_BUILDFLAGS += -tags sidero.debug
142+
GO_BUILDTAGS := $(GO_BUILDTAGS)sidero.debug,
135143
else
136144
GO_LDFLAGS += -s
137145
endif
@@ -163,6 +171,10 @@ local-%: ## Builds the specified target defined in the Dockerfile using the loc
163171
fi; \
164172
done'
165173

174+
.PHONY: check-dirty
175+
check-dirty:
176+
@if test -n "`git status --porcelain`"; then echo "Source tree is dirty"; git status; git diff; exit 1 ; fi
177+
166178
generate: ## Generate .proto definitions.
167179
@$(MAKE) local-$@ DEST=./
168180

0 commit comments

Comments
 (0)