Skip to content

Commit 3235c29

Browse files
author
Dmitriy Matrenichev
committed
chore: bump deps
Run rekres. Bump deps: - google.golang.org/grpc to v1.69.4 - google.golang.org/protobuf to v1.36.3 - golang.org/x/sys to v0.29.0 Signed-off-by: Dmitriy Matrenichev <[email protected]>
1 parent 0d84c65 commit 3235c29

File tree

8 files changed

+85
-33
lines changed

8 files changed

+85
-33
lines changed

.github/renovate.json

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
{
2+
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
3+
"description": "THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT.",
4+
"prHeader": "Update Request | Renovate Bot",
5+
"extends": [
6+
":dependencyDashboard",
7+
":gitSignOff",
8+
":semanticCommitScopeDisabled",
9+
"schedule:earlyMondays"
10+
],
11+
"packageRules": [
12+
{
13+
"groupName": "dependencies",
14+
"matchUpdateTypes": [
15+
"major",
16+
"minor",
17+
"patch",
18+
"pin",
19+
"digest"
20+
]
21+
},
22+
{
23+
"enabled": false,
24+
"matchFileNames": [
25+
"Dockerfile"
26+
]
27+
},
28+
{
29+
"enabled": false,
30+
"matchFileNames": [
31+
".github/workflows/*.yaml"
32+
]
33+
}
34+
],
35+
"separateMajorMinor": false
36+
}

.github/workflows/ci.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 2024-09-27T16:09:47Z by kres 8be5fa7.
3+
# Generated on 2025-01-22T19:00:42Z by kres 3075de9.
44

55
name: default
66
concurrency:
@@ -77,7 +77,7 @@ jobs:
7777
run: |
7878
make unit-tests-race
7979
- name: coverage
80-
uses: codecov/codecov-action@v4
80+
uses: codecov/codecov-action@v5
8181
with:
8282
files: _out/coverage-unit-tests.txt
8383
token: ${{ secrets.CODECOV_TOKEN }}

.github/workflows/slack-notify.yaml

Lines changed: 5 additions & 5 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 2024-09-27T16:09:47Z by kres 8be5fa7.
3+
# Generated on 2025-01-22T19:00:42Z by kres 3075de9.
44

55
name: slack-notify
66
"on":
@@ -24,11 +24,12 @@ jobs:
2424
run: |
2525
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
2626
- name: Slack Notify
27-
uses: slackapi/slack-github-action@v1
27+
uses: slackapi/slack-github-action@v2
2828
with:
29-
channel-id: proj-talos-maintainers
29+
method: chat.postMessage
3030
payload: |
3131
{
32+
"channel": "proj-talos-maintainers",
3233
"attachments": [
3334
{
3435
"color": "${{ github.event.workflow_run.conclusion == 'success' && '#2EB886' || github.event.workflow_run.conclusion == 'failure' && '#A30002' || '#FFCC00' }}",
@@ -88,5 +89,4 @@ jobs:
8889
}
8990
]
9091
}
91-
env:
92-
SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}
92+
token: ${{ secrets.SLACK_BOT_TOKEN }}

.golangci.yml

Lines changed: 3 additions & 3 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 2024-09-27T16:09:47Z by kres 8be5fa7.
3+
# Generated on 2025-01-22T19:00:42Z by kres 3075de9.
44

55
# options for analysis running
66
run:
@@ -17,7 +17,6 @@ output:
1717
path: stdout
1818
print-issued-lines: true
1919
print-linter-name: true
20-
uniq-by-line: true
2120
path-prefix: ""
2221

2322
# all available settings of specific linters
@@ -116,7 +115,6 @@ linters:
116115
- gochecknoglobals
117116
- gochecknoinits
118117
- godox
119-
- gomnd
120118
- gomoddirectives
121119
- gosec
122120
- inamedparam
@@ -135,6 +133,7 @@ linters:
135133
- perfsprint # complains about us using fmt.Sprintf in non-performance critical code, updating just kres took too long
136134
- goimports # same as gci
137135
- musttag # seems to be broken - goes into imported libraries and reports issues there
136+
- exportloopref # WARN The linter 'exportloopref' is deprecated (since v1.60.2) due to: Since Go1.22 (loopvar) this linter is no longer relevant. Replaced by copyloopvar.
138137

139138
issues:
140139
exclude: [ ]
@@ -144,6 +143,7 @@ issues:
144143
max-issues-per-linter: 10
145144
max-same-issues: 3
146145
new: false
146+
uniq-by-line: true
147147

148148
severity:
149149
default-severity: error

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
# syntax = docker/dockerfile-upstream:1.10.0-labs
1+
# syntax = docker/dockerfile-upstream:1.12.1-labs
22

33
# THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT.
44
#
5-
# Generated on 2024-10-02T14:07:05Z by kres 34e72ac.
5+
# Generated on 2025-01-22T19:00:42Z by kres 3075de9.
66

77
ARG TOOLCHAIN
88

Makefile

Lines changed: 20 additions & 6 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 2024-10-02T14:07:05Z by kres 34e72ac.
3+
# Generated on 2025-01-22T19:00:42Z by kres 3075de9.
44

55
# common variables
66

@@ -17,15 +17,15 @@ WITH_RACE ?= false
1717
REGISTRY ?= ghcr.io
1818
USERNAME ?= siderolabs
1919
REGISTRY_AND_USERNAME ?= $(REGISTRY)/$(USERNAME)
20-
PROTOBUF_GO_VERSION ?= 1.34.2
20+
PROTOBUF_GO_VERSION ?= 1.36.2
2121
GRPC_GO_VERSION ?= 1.5.1
22-
GRPC_GATEWAY_VERSION ?= 2.22.0
22+
GRPC_GATEWAY_VERSION ?= 2.25.1
2323
VTPROTOBUF_VERSION ?= 0.6.0
24-
GOIMPORTS_VERSION ?= 0.25.0
24+
GOIMPORTS_VERSION ?= 0.29.0
2525
DEEPCOPY_VERSION ?= v0.5.6
26-
GOLANGCILINT_VERSION ?= v1.61.0
26+
GOLANGCILINT_VERSION ?= v1.63.4
2727
GOFUMPT_VERSION ?= v0.7.0
28-
GO_VERSION ?= 1.23.2
28+
GO_VERSION ?= 1.23.4
2929
GO_BUILDFLAGS ?=
3030
GO_LDFLAGS ?=
3131
CGO_ENABLED ?= 0
@@ -41,10 +41,12 @@ PLATFORM ?= linux/amd64
4141
PROGRESS ?= auto
4242
PUSH ?= false
4343
CI_ARGS ?=
44+
BUILDKIT_MULTI_PLATFORM ?=
4445
COMMON_ARGS = --file=Dockerfile
4546
COMMON_ARGS += --provenance=false
4647
COMMON_ARGS += --progress=$(PROGRESS)
4748
COMMON_ARGS += --platform=$(PLATFORM)
49+
COMMON_ARGS += --build-arg=BUILDKIT_MULTI_PLATFORM=$(BUILDKIT_MULTI_PLATFORM)
4850
COMMON_ARGS += --push=$(PUSH)
4951
COMMON_ARGS += --build-arg=ARTIFACTS="$(ARTIFACTS)"
5052
COMMON_ARGS += --build-arg=SHA="$(SHA)"
@@ -143,8 +145,20 @@ clean: ## Cleans up all artifacts.
143145
target-%: ## Builds the specified target defined in the Dockerfile. The build result will only remain in the build cache.
144146
@$(BUILD) --target=$* $(COMMON_ARGS) $(TARGET_ARGS) $(CI_ARGS) .
145147

148+
registry-%: ## Builds the specified target defined in the Dockerfile and the output is an image. The image is pushed to the registry if PUSH=true.
149+
@$(MAKE) target-$* TARGET_ARGS="--tag=$(REGISTRY)/$(USERNAME)/$(IMAGE_NAME):$(IMAGE_TAG)" BUILDKIT_MULTI_PLATFORM=1
150+
146151
local-%: ## Builds the specified target defined in the Dockerfile using the local output type. The build result will be output to the specified local destination.
147152
@$(MAKE) target-$* TARGET_ARGS="--output=type=local,dest=$(DEST) $(TARGET_ARGS)"
153+
@PLATFORM=$(PLATFORM) DEST=$(DEST) bash -c '\
154+
for platform in $$(tr "," "\n" <<< "$$PLATFORM"); do \
155+
directory="$${platform//\//_}"; \
156+
if [[ -d "$$DEST/$$directory" ]]; then \
157+
echo $$platform; \
158+
mv -f "$$DEST/$$directory/"* $$DEST; \
159+
rmdir "$$DEST/$$directory/"; \
160+
fi; \
161+
done'
148162

149163
lint-golangci-lint: ## Runs golangci-lint linter.
150164
@$(MAKE) target-$@

go.mod

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ go 1.23.0
44

55
require (
66
github.com/planetscale/vtprotobuf v0.6.1-0.20240917153116-6f2963f01587
7-
google.golang.org/grpc v1.67.0
8-
google.golang.org/protobuf v1.34.2
7+
google.golang.org/grpc v1.69.4
8+
google.golang.org/protobuf v1.36.3
99
)
1010

11-
require golang.org/x/sys v0.25.0 // indirect
11+
require golang.org/x/sys v0.29.0 // indirect

go.sum

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,17 @@ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
22
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
33
github.com/planetscale/vtprotobuf v0.6.1-0.20240917153116-6f2963f01587 h1:xzZOeCMQLA/W198ZkdVdt4EKFKJtS26B773zNU377ZY=
44
github.com/planetscale/vtprotobuf v0.6.1-0.20240917153116-6f2963f01587/go.mod h1:t/avpk3KcrXxUnYOhZhMXJlSEyie6gQbtLq5NM3loB8=
5-
golang.org/x/net v0.28.0 h1:a9JDOJc5GMUJ0+UDqmLT86WiEy7iWyIhz8gz8E4e5hE=
6-
golang.org/x/net v0.28.0/go.mod h1:yqtgsTWOOnlGLG9GFRrK3++bGOUEkNBoHZc8MEDWPNg=
7-
golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34=
8-
golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
9-
golang.org/x/text v0.17.0 h1:XtiM5bkSOt+ewxlOE/aE/AKEHibwj/6gvWMl9Rsh0Qc=
10-
golang.org/x/text v0.17.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
11-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240814211410-ddb44dafa142 h1:e7S5W7MGGLaSu8j3YjdezkZ+m1/Nm0uRVRMEMGk26Xs=
12-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240814211410-ddb44dafa142/go.mod h1:UqMtugtsSgubUsoxbuAoiCXvqvErP7Gf0so0mK9tHxU=
13-
google.golang.org/grpc v1.67.0 h1:IdH9y6PF5MPSdAntIcpjQ+tXO41pcQsfZV2RxtQgVcw=
14-
google.golang.org/grpc v1.67.0/go.mod h1:1gLDyUQU7CTLJI90u3nXZ9ekeghjeM7pTDZlqFNg2AA=
15-
google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg=
16-
google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw=
5+
golang.org/x/net v0.30.0 h1:AcW1SDZMkb8IpzCdQUaIq2sP4sZ4zw+55h6ynffypl4=
6+
golang.org/x/net v0.30.0/go.mod h1:2wGyMJ5iFasEhkwi13ChkO/t1ECNC4X4eBKkVFyYFlU=
7+
golang.org/x/sys v0.26.0 h1:KHjCJyddX0LoSTb3J+vWpupP9p0oznkqVk/IfjymZbo=
8+
golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
9+
golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU=
10+
golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
11+
golang.org/x/text v0.19.0 h1:kTxAhCbGbxhK0IwgSKiMO5awPoDQ0RpfiVYBfK860YM=
12+
golang.org/x/text v0.19.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
13+
google.golang.org/genproto/googleapis/rpc v0.0.0-20241015192408-796eee8c2d53 h1:X58yt85/IXCx0Y3ZwN6sEIKZzQtDEYaBWrDvErdXrRE=
14+
google.golang.org/genproto/googleapis/rpc v0.0.0-20241015192408-796eee8c2d53/go.mod h1:GX3210XPVPUjJbTUbvwI8f2IpZDMZuPJWDzDuebbviI=
15+
google.golang.org/grpc v1.69.4 h1:MF5TftSMkd8GLw/m0KM6V8CMOCY6NZ1NQDPGFgbTt4A=
16+
google.golang.org/grpc v1.69.4/go.mod h1:vyjdE6jLBI76dgpDojsFGNaHlxdjXN9ghpnd2o7JGZ4=
17+
google.golang.org/protobuf v1.36.3 h1:82DV7MYdb8anAVi3qge1wSnMDrnKK7ebr+I0hHRN1BU=
18+
google.golang.org/protobuf v1.36.3/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=

0 commit comments

Comments
 (0)