Skip to content

Commit de4d5cb

Browse files
committed
chore: bump dependencies
Rekres & bump, some minor deps to address Dependabot alerts. Signed-off-by: Andrey Smirnov <andrey.smirnov@siderolabs.com>
1 parent 53b0619 commit de4d5cb

13 files changed

Lines changed: 108 additions & 44 deletions

File tree

.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 2026-01-12T10:23:28Z by kres 0e8da31.
3+
# Generated on 2026-04-28T10:33:12Z by kres e4dc583.
44

55
*
66
!cmd
@@ -12,3 +12,4 @@
1212
!README.md
1313
!.markdownlint.json
1414
!hack/govulncheck.sh
15+
!.disvulncheck.yaml

.github/workflows/ci.yaml

Lines changed: 18 additions & 10 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 2026-01-12T10:23:28Z by kres 0e8da31.
3+
# Generated on 2026-04-28T10:33:12Z by kres e4dc583.
44

55
concurrency:
66
group: ${{ github.head_ref || github.run_id }}
@@ -55,17 +55,25 @@ jobs:
5555
done
5656
continue-on-error: true
5757
- name: checkout
58-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # version: v6.0.1
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@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # version: v3.12.0
64+
uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # version: v4.0.0
6565
with:
6666
driver: remote
6767
endpoint: tcp://buildkit-amd64.ci.svc.cluster.local:1234
6868
timeout-minutes: 10
69+
- name: CI temp release tag
70+
if: github.event_name == 'pull_request'
71+
run: |
72+
make ci-temp-release-tag
73+
- name: Check dirty
74+
if: github.event_name == 'pull_request'
75+
run: |
76+
make check-dirty
6977
- name: base
7078
run: |
7179
make base
@@ -74,7 +82,7 @@ jobs:
7482
make conform
7583
- name: Login to registry
7684
if: github.event_name != 'pull_request'
77-
uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # version: v3.6.0
85+
uses: docker/login-action@4907a6ddec9925e35a0a9e82d7399ccc52663121 # version: v4.1.0
7886
with:
7987
password: ${{ secrets.GITHUB_TOKEN }}
8088
registry: ghcr.io
@@ -108,7 +116,7 @@ jobs:
108116
make release-notes
109117
- name: Release
110118
if: startsWith(github.ref, 'refs/tags/')
111-
uses: softprops/action-gh-release@a06a81a03ee405af7f2048a818ed3f03bbf83c7b # version: v2.5.0
119+
uses: softprops/action-gh-release@b4309332981a82ec1c5618f44dd2e27cc8bfbfda # version: v3.0.0
112120
with:
113121
body_path: _out/RELEASE_NOTES.md
114122
draft: "true"
@@ -148,13 +156,13 @@ jobs:
148156
done
149157
continue-on-error: true
150158
- name: checkout
151-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # version: v6.0.1
159+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # version: v6.0.2
152160
- name: Unshallow
153161
run: |
154162
git fetch --prune --unshallow
155163
- name: Set up Docker Buildx
156164
id: setup-buildx
157-
uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # version: v3.12.0
165+
uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # version: v4.0.0
158166
with:
159167
driver: remote
160168
endpoint: tcp://buildkit-amd64.ci.svc.cluster.local:1234
@@ -195,13 +203,13 @@ jobs:
195203
done
196204
continue-on-error: true
197205
- name: checkout
198-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # version: v6.0.1
206+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # version: v6.0.2
199207
- name: Unshallow
200208
run: |
201209
git fetch --prune --unshallow
202210
- name: Set up Docker Buildx
203211
id: setup-buildx
204-
uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # version: v3.12.0
212+
uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # version: v4.0.0
205213
with:
206214
driver: remote
207215
endpoint: tcp://buildkit-amd64.ci.svc.cluster.local:1234
@@ -213,7 +221,7 @@ jobs:
213221
run: |
214222
make unit-tests-race
215223
- name: coverage
216-
uses: codecov/codecov-action@671740ac38dd9b0130fbe1cec585b89eea48d3de # version: v5.5.2
224+
uses: codecov/codecov-action@57e3a136b779b570ffcdbf80b3bdc90e7fab3de2 # version: v6.0.0
217225
with:
218226
files: _out/coverage-unit-tests.txt
219227
flags: unit-tests

.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 2026-01-12T10:23:28Z by kres 0e8da31.
3+
# Generated on 2026-04-28T10:33:12Z by kres e4dc583.
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@91efab103c0de0a537f72a35f6b8cda0ee76bf0a # version: v2.1.1
21+
uses: slackapi/slack-github-action@03ea5433c137af7c0495bc0cad1af10403fc800c # version: v3.0.2
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 2026-01-12T10:23:28Z by kres 0e8da31.
3+
# Generated on 2026-04-28T10:33:12Z by kres e4dc583.
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@91efab103c0de0a537f72a35f6b8cda0ee76bf0a # version: v2.1.1
26+
uses: slackapi/slack-github-action@03ea5433c137af7c0495bc0cad1af10403fc800c # version: v3.0.2
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 2026-01-12T10:23:28Z by kres 0e8da31.
3+
# Generated on 2026-04-28T10:33:12Z by kres e4dc583.
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@997185467fa4f803885201cee163a9f38240193d # version: v10.1.1
18+
uses: actions/stale@b5d41d4e1d5dceea10e7104786b73624c18a190f # version: v10.2.0
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 2026-01-12T10:23:28Z by kres 0e8da31.
3+
# Generated on 2026-04-28T10:33:12Z by kres e4dc583.
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: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
1-
# syntax = docker/dockerfile-upstream:1.20.0-labs
1+
# syntax = docker/dockerfile-upstream:1.23.0-labs
22

33
# THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT.
44
#
5-
# Generated on 2026-01-12T10:23:28Z by kres 0e8da31.
5+
# Generated on 2026-04-28T10:33:12Z by kres e4dc583.
66

77
ARG TOOLCHAIN=scratch
88

9-
FROM ghcr.io/siderolabs/ca-certificates:v1.12.0 AS image-ca-certificates
9+
FROM ghcr.io/siderolabs/ca-certificates:v1.13.0 AS image-ca-certificates
1010

11-
FROM ghcr.io/siderolabs/fhs:v1.12.0 AS image-fhs
11+
FROM ghcr.io/siderolabs/fhs:v1.13.0 AS image-fhs
1212

1313
# runs markdownlint
14-
FROM docker.io/oven/bun:1.3.5-alpine AS lint-markdown
14+
FROM docker.io/oven/bun:1.3.13-alpine AS lint-markdown
1515
WORKDIR /src
16-
RUN bun i markdownlint-cli@0.47.0 sentences-per-line@0.5.0
16+
RUN bun i markdownlint-cli@0.48.0 sentences-per-line@0.5.2
1717
COPY .markdownlint.json .
1818
COPY ./CHANGELOG.md ./CHANGELOG.md
1919
COPY ./README.md ./README.md
@@ -41,6 +41,9 @@ RUN --mount=type=cache,target=/root/.cache/go-build,id=conform/root/.cache/go-bu
4141
&& mv /go/bin/golangci-lint /bin/golangci-lint
4242
RUN --mount=type=cache,target=/root/.cache/go-build,id=conform/root/.cache/go-build --mount=type=cache,target=/go/pkg,id=conform/go/pkg go install golang.org/x/vuln/cmd/govulncheck@latest \
4343
&& mv /go/bin/govulncheck /bin/govulncheck
44+
ARG DIS_VULNCHECK_VERSION
45+
RUN --mount=type=cache,target=/root/.cache/go-build,id=conform/root/.cache/go-build --mount=type=cache,target=/go/pkg,id=conform/go/pkg go install github.com/shanduur/dis-vulncheck@${DIS_VULNCHECK_VERSION} \
46+
&& mv /go/bin/dis-vulncheck /bin/dis-vulncheck
4447
ARG GOFUMPT_VERSION
4548
RUN go install mvdan.cc/gofumpt@${GOFUMPT_VERSION} \
4649
&& mv /go/bin/gofumpt /bin/gofumpt
@@ -87,8 +90,7 @@ RUN --mount=type=cache,target=/root/.cache/go-build,id=conform/root/.cache/go-bu
8790
# runs govulncheck
8891
FROM base AS lint-govulncheck
8992
WORKDIR /src
90-
COPY --chmod=0755 hack/govulncheck.sh ./hack/govulncheck.sh
91-
RUN --mount=type=cache,target=/root/.cache/go-build,id=conform/root/.cache/go-build --mount=type=cache,target=/go/pkg,id=conform/go/pkg ./hack/govulncheck.sh ./...
93+
RUN --mount=type=cache,target=/root/.cache/go-build,id=conform/root/.cache/go-build --mount=type=cache,target=/go/pkg,id=conform/go/pkg dis-vulncheck -tool=false ./...
9294

9395
# runs unit-tests with race detector
9496
FROM base AS unit-tests-race

Makefile

Lines changed: 36 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,35 @@
11
# THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT.
22
#
3-
# Generated on 2026-01-12T10:23:28Z by kres 0e8da31.
3+
# Generated on 2026-04-28T10:33:12Z by kres e4dc583.
44

55
# common variables
66

77
SHA := $(shell git describe --match=none --always --abbrev=8 --dirty)
8-
TAG := $(shell git describe --tag --always --dirty --match v[0-9]\*)
8+
TAG ?= $(shell git describe --tag --always --dirty --match v[0-9]\*)
99
TAG_SUFFIX ?=
10-
ABBREV_TAG := $(shell git describe --tags >/dev/null 2>/dev/null && git describe --tag --always --match v[0-9]\* --abbrev=0 || echo 'undefined')
10+
ABBREV_TAG ?= $(shell git describe --tags >/dev/null 2>/dev/null && git describe --tag --always --match v[0-9]\* --abbrev=0 || echo 'undefined')
1111
BRANCH := $(shell git rev-parse --abbrev-ref HEAD)
1212
ARTIFACTS := _out
1313
IMAGE_TAG ?= $(TAG)$(TAG_SUFFIX)
1414
OPERATING_SYSTEM := $(shell uname -s | tr '[:upper:]' '[:lower:]')
1515
GOARCH := $(shell uname -m | sed 's/x86_64/amd64/' | sed 's/aarch64/arm64/')
16+
CI_RELEASE_TAG := $(shell git log --oneline --format=%B -n 1 HEAD^2 -- 2>/dev/null | head -n 1 | sed -r "/^release\(.*\)/ s/^release\((.*)\):.*$$/\\1/; t; Q")
1617
WITH_DEBUG ?= false
1718
WITH_RACE ?= false
1819
REGISTRY ?= ghcr.io
1920
USERNAME ?= siderolabs
2021
REGISTRY_AND_USERNAME ?= $(REGISTRY)/$(USERNAME)
2122
PROTOBUF_GO_VERSION ?= 1.36.11
22-
GRPC_GO_VERSION ?= 1.6.0
23-
GRPC_GATEWAY_VERSION ?= 2.27.4
23+
GRPC_GO_VERSION ?= 1.6.1
24+
GRPC_GATEWAY_VERSION ?= 2.29.0
2425
VTPROTOBUF_VERSION ?= 0.6.0
25-
GOIMPORTS_VERSION ?= 0.40.0
26+
GOIMPORTS_VERSION ?= 0.44.0
2627
GOMOCK_VERSION ?= 0.6.0
2728
DEEPCOPY_VERSION ?= v0.5.8
28-
GOLANGCILINT_VERSION ?= v2.7.2
29+
GOLANGCILINT_VERSION ?= v2.11.4
2930
GOFUMPT_VERSION ?= v0.9.2
30-
GO_VERSION ?= 1.25.5
31+
GO_VERSION ?= 1.26.2
32+
DIS_VULNCHECK_VERSION ?= v0.0.0-20260409114749-05440f84fe69
3133
GO_BUILDFLAGS ?=
3234
GO_BUILDTAGS ?= ,
3335
GO_LDFLAGS ?=
@@ -75,8 +77,9 @@ COMMON_ARGS += --build-arg=GOMOCK_VERSION="$(GOMOCK_VERSION)"
7577
COMMON_ARGS += --build-arg=DEEPCOPY_VERSION="$(DEEPCOPY_VERSION)"
7678
COMMON_ARGS += --build-arg=GOLANGCILINT_VERSION="$(GOLANGCILINT_VERSION)"
7779
COMMON_ARGS += --build-arg=GOFUMPT_VERSION="$(GOFUMPT_VERSION)"
80+
COMMON_ARGS += --build-arg=DIS_VULNCHECK_VERSION="$(DIS_VULNCHECK_VERSION)"
7881
COMMON_ARGS += --build-arg=TESTPKGS="$(TESTPKGS)"
79-
TOOLCHAIN ?= docker.io/golang:1.25-alpine
82+
TOOLCHAIN ?= docker.io/golang:1.26-alpine
8083

8184
# help menu
8285

@@ -153,6 +156,14 @@ $(ARTIFACTS): ## Creates artifacts directory.
153156
clean: ## Cleans up all artifacts.
154157
@rm -rf $(ARTIFACTS)
155158

159+
.PHONY: ci-temp-release-tag
160+
ci-temp-release-tag: ## Generates a temporary release tag for CI run.
161+
@if [ -n "$(CI_RELEASE_TAG)" -a -n "$${GITHUB_ENV}" ]; then \
162+
echo Setting temporary release tag "$(CI_RELEASE_TAG)"; \
163+
echo "TAG=$(CI_RELEASE_TAG)" >> "$${GITHUB_ENV}"; \
164+
echo "ABBREV_TAG=$(CI_RELEASE_TAG)" >> "$${GITHUB_ENV}"; \
165+
fi
166+
156167
target-%: ## Builds the specified target defined in the Dockerfile. The build result will only remain in the build cache.
157168
@$(BUILD) --target=$* $(COMMON_ARGS) $(TARGET_ARGS) $(CI_ARGS) .
158169

@@ -171,6 +182,10 @@ local-%: ## Builds the specified target defined in the Dockerfile using the loc
171182
fi; \
172183
done'
173184

185+
.PHONY: check-dirty
186+
check-dirty: generate
187+
@if test -n "`git status --porcelain`"; then echo "Source tree is dirty"; git status; git diff; exit 1 ; fi
188+
174189
generate: ## Generate .proto definitions.
175190
@$(MAKE) local-$@ DEST=./
176191

@@ -270,3 +285,15 @@ conformance:
270285
@docker pull $(CONFORMANCE_IMAGE)
271286
@docker run --rm -it -v $(PWD):/src -w /src $(CONFORMANCE_IMAGE) enforce
272287

288+
.PHONY: renovate-local
289+
renovate-local: ## runs renovate locally to check syntax and test configuration
290+
@docker run --rm \
291+
--user $(shell id -u):$(shell id -g) \
292+
-v $(PWD):/src \
293+
-w /src \
294+
-e GITHUB_TOKEN \
295+
-e LOG_LEVEL=debug \
296+
-e RENOVATE_PLATFORM=local \
297+
-e RENOVATE_DRY_RUN=full \
298+
renovate/renovate
299+

cmd/conform/enforce.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ var enforceCmd = &cobra.Command{
3333

3434
// Get the config path value
3535
configPath := cmd.Flags().Lookup("config").Value.String()
36+
3637
e, err := enforcer.New(configPath, reporter)
3738
if err != nil {
3839
return fmt.Errorf("failed to create enforcer: %w", err)
@@ -51,6 +52,7 @@ var enforceCmd = &cobra.Command{
5152
if err != nil {
5253
return fmt.Errorf("failed to detect main branch: %w", err)
5354
}
55+
5456
if mainBranch != "" {
5557
opts = append(opts, policy.WithCommitRef(fmt.Sprintf("refs/heads/%s", mainBranch)))
5658
}

cmd/conform/serve.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,13 +58,15 @@ var serveCmd = &cobra.Command{
5858

5959
return
6060
}
61+
6162
if err = os.MkdirAll(filepath.Join(dir, "repo"), 0o700); err != nil {
6263
log.Printf("failed to create repo directory: %+v\n", err)
6364

6465
return
6566
}
6667

6768
event := filepath.Join(dir, "github", "event.json")
69+
6870
pullRequestEvent := &github.PullRequestEvent{}
6971
if err = json.Unmarshal(payload, pullRequestEvent); err != nil {
7072
log.Printf("failed to parse pull_request event: %+v\n", err)
@@ -131,17 +133,20 @@ var serveCmd = &cobra.Command{
131133

132134
return
133135
}
136+
134137
cmd := exec.Command("/proc/self/exe", "enforce", "--reporter=github", "--commit-ref=refs/heads/"+pullRequestEvent.GetPullRequest().GetBase().GetRef())
135138
cmd.Stdout = os.Stdout
136139
cmd.Stderr = os.Stdout
137140
cmd.Dir = cloneRepo
138141
cmd.Env = []string{fmt.Sprintf("INPUT_TOKEN=%s", os.Getenv("INPUT_TOKEN")), fmt.Sprintf("GITHUB_EVENT_PATH=%s", event)}
142+
139143
err = cmd.Start()
140144
if err != nil {
141145
log.Printf("failed to start command: %+v\n", err)
142146

143147
return
144148
}
149+
145150
err = cmd.Wait()
146151
if err != nil {
147152
log.Printf("command failed: %+v\n", err)

0 commit comments

Comments
 (0)