Skip to content

Commit 2ad4508

Browse files
author
Dmitriy Matrenichev
committed
chore: bump deps
Bump deps: - run rekres - bump github.com/containerd/containerd to v1.7.8 - bump github.com/moby/buildkit to v0.12.3 - bump github.com/opencontainers/image-spec to v1.1.0-rc5 - bump github.com/otiai10/copy to v1.14.0 - bump golang.org/x/oauth2 to v0.13.0 - bump golang.org/x/sync to v0.4.0 - bump github.com/google/go-github to v56.0.0 Signed-off-by: Dmitriy Matrenichev <[email protected]>
1 parent 02c15d5 commit 2ad4508

File tree

8 files changed

+194
-93
lines changed

8 files changed

+194
-93
lines changed

‎.github/workflows/ci.yaml‎

Lines changed: 35 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,55 @@
11
# THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT.
22
#
3-
# Generated on 2023-09-15T14:46:13Z by kres latest.
3+
# Generated on 2023-10-30T17:28:15Z by kres latest.
44

55
name: default
6+
concurrency:
7+
group: ${{ github.head_ref || github.run_id }}
8+
cancel-in-progress: true
69
"on":
710
push:
811
branches:
912
- main
13+
- release-*
1014
tags:
1115
- v*
12-
pull_request: {}
13-
env:
14-
CI_ARGS: --cache-from=type=registry,ref=registry.dev.siderolabs.io/${GITHUB_REPOSITORY}:buildcache --cache-to=type=registry,ref=registry.dev.siderolabs.io/${GITHUB_REPOSITORY}:buildcache,mode=max
16+
pull_request:
17+
branches:
18+
- main
19+
- release-*
1520
jobs:
1621
default:
1722
permissions:
23+
actions: read
1824
contents: write
1925
packages: write
26+
pull-requests: read
2027
runs-on:
2128
- self-hosted
22-
- X64
23-
if: ${{ !startsWith(github.head_ref, 'renovate/') || !startsWith(github.head_ref, 'renovate/') }}
29+
- generic
30+
if: (!startsWith(github.head_ref, 'renovate/') && !startsWith(github.head_ref, 'dependabot/'))
31+
outputs:
32+
labels: ${{ steps.workflow-run-info.outputs.pullRequestLabels }}
33+
services:
34+
buildkitd:
35+
image: moby/buildkit:v0.12.2
36+
options: --privileged
37+
ports:
38+
- 1234:1234
39+
volumes:
40+
- /var/lib/buildkit/${{ github.repository }}:/var/lib/buildkit
41+
- /usr/etc/buildkit/buildkitd.toml:/etc/buildkit/buildkitd.toml
2442
steps:
2543
- name: checkout
26-
uses: actions/checkout@v3
44+
uses: actions/checkout@v4
2745
- name: Unshallow
2846
run: |
2947
git fetch --prune --unshallow
3048
- name: Set up Docker Buildx
31-
uses: docker/setup-buildx-action@v2
49+
uses: docker/setup-buildx-action@v3
3250
with:
33-
config-inline: |
34-
[worker.oci]
35-
gc = true
36-
gckeepstorage = 100000 # 100 GiB
37-
38-
[[worker.oci.gcpolicy]]
39-
keepBytes = 32212254720 # 30 GiB
40-
keepDuration = 604800
41-
filters = [ "type==source.local", "type==exec.cachemount", "type==source.git.checkout"]
42-
[[worker.oci.gcpolicy]]
43-
all = true
44-
keepBytes = 107374182400 # 100 GiB
51+
driver: remote
52+
endpoint: tcp://localhost:1234
4553
- name: base
4654
run: |
4755
make base
@@ -62,7 +70,7 @@ jobs:
6270
make lint
6371
- name: Login to registry
6472
if: github.event_name != 'pull_request'
65-
uses: docker/login-action@v2
73+
uses: docker/login-action@v3
6674
with:
6775
password: ${{ secrets.GITHUB_TOKEN }}
6876
registry: ghcr.io
@@ -82,6 +90,11 @@ jobs:
8290
REGISTRY: registry.dev.siderolabs.io
8391
run: |
8492
make integration
93+
- name: Retrieve workflow info
94+
id: workflow-run-info
95+
uses: potiuk/get-workflow-origin@v1_5
96+
with:
97+
token: ${{ secrets.GITHUB_TOKEN }}
8598
- name: Generate Checksums
8699
if: startsWith(github.ref, 'refs/tags/')
87100
run: |
@@ -93,7 +106,7 @@ jobs:
93106
make release-notes
94107
- name: Release
95108
if: startsWith(github.ref, 'refs/tags/')
96-
uses: crazy-max/ghaction-github-release@v1
109+
uses: crazy-max/ghaction-github-release@v2
97110
with:
98111
body_path: _out/RELEASE_NOTES.md
99112
draft: "true"

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

Lines changed: 91 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,91 @@
1+
# THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT.
2+
#
3+
# Generated on 2023-10-30T17:28:15Z by kres latest.
4+
5+
name: slack-notify
6+
"on":
7+
workflow_run:
8+
workflows:
9+
- default
10+
types:
11+
- completed
12+
jobs:
13+
slack-notify:
14+
runs-on:
15+
- self-hosted
16+
- generic
17+
if: ${{ github.event.workflow_run.conclusion != 'skipped' }}
18+
steps:
19+
- name: Retrieve Workflow Run Info
20+
id: retrieve-workflow-run-info
21+
uses: potiuk/get-workflow-origin@v1_5
22+
with:
23+
sourceRunId: ${{ github.event.workflow_run.id }}
24+
token: ${{ secrets.GITHUB_TOKEN }}
25+
- name: Slack Notify
26+
uses: slackapi/slack-github-action@v1
27+
with:
28+
channel-id: proj-talos-maintainers
29+
payload: |
30+
{
31+
"attachments": [
32+
{
33+
"color": "${{ github.event.workflow_run.conclusion == 'success' && '#2EB886' || github.event.workflow_run.conclusion == 'failure' && '#A30002' || '#FFCC00' }}",
34+
"fallback": "test",
35+
"blocks": [
36+
{
37+
"type": "section",
38+
"fields": [
39+
{
40+
"type": "mrkdwn",
41+
"text": "${{ github.event.workflow_run.event == 'pull_request' && format('*Pull Request:* {0} (`{1}`)\n<{2}/pull/{3}|{4}>', github.repository, github.ref_name, github.event.repository.html_url, steps.retrieve-workflow-run-info.outputs.pullRequestNumber, github.event.workflow_run.display_title) || format('*Build:* {0}#{1} (`{2}`)', github.repository, github.sha, github.ref_name) }}"
42+
},
43+
{
44+
"type": "mrkdwn",
45+
"text": "*Status:*\n`${{ github.event.workflow_run.conclusion }}`"
46+
}
47+
]
48+
},
49+
{
50+
"type": "section",
51+
"fields": [
52+
{
53+
"type": "mrkdwn",
54+
"text": "*Author:*\n`${{ github.actor }}`"
55+
},
56+
{
57+
"type": "mrkdwn",
58+
"text": "*Event:*\n`${{ github.event.workflow_run.event }}`"
59+
}
60+
]
61+
},
62+
{
63+
"type": "divider"
64+
},
65+
{
66+
"type": "actions",
67+
"elements": [
68+
{
69+
"type": "button",
70+
"text": {
71+
"type": "plain_text",
72+
"text": "Logs"
73+
},
74+
"url": "${{ github.event.workflow_run.html_url }}"
75+
},
76+
{
77+
"type": "button",
78+
"text": {
79+
"type": "plain_text",
80+
"text": "Commit"
81+
},
82+
"url": "${{ github.event.repository.html_url }}/commit/${{ github.sha }}"
83+
}
84+
]
85+
}
86+
]
87+
}
88+
]
89+
}
90+
env:
91+
SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}

‎.golangci.yml‎

Lines changed: 4 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 2023-09-11T14:30:57Z by kres 8540947-dirty.
3+
# Generated on 2023-10-30T17:28:15Z by kres latest.
44

55
# options for analysis running
66
run:
@@ -150,6 +150,9 @@ linters:
150150
- wrapcheck
151151
- depguard # Disabled because starting with golangci-lint 1.53.0 it doesn't allow denylist alone anymore
152152
- tagalign
153+
- inamedparam
154+
- testifylint # complains about our assert recorder and has a number of false positives for assert.Greater(t, thing, 1)
155+
- protogetter # complains about us using Value field on typed spec, instead of GetValue which has a different signature
153156
# abandoned linters for which golangci shows the warning that the repo is archived by the owner
154157
- interfacer
155158
- maligned

‎Dockerfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
# THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT.
44
#
5-
# Generated on 2023-09-11T14:47:35Z by kres 8540947-dirty.
5+
# Generated on 2023-10-30T17:28:15Z by kres latest.
66

77
ARG TOOLCHAIN
88

@@ -11,9 +11,9 @@ FROM ghcr.io/siderolabs/ca-certificates:v1.6.0-alpha.0-10-gd3d7d29 AS image-ca-c
1111
FROM ghcr.io/siderolabs/fhs:v1.6.0-alpha.0-10-gd3d7d29 AS image-fhs
1212

1313
# runs markdownlint
14-
FROM docker.io/node:20.5.1-alpine3.18 AS lint-markdown
14+
FROM docker.io/node:20.8.0-alpine3.18 AS lint-markdown
1515
WORKDIR /src
16-
RUN npm i -g markdownlint-cli@0.35.0
16+
RUN npm i -g markdownlint-cli@0.37.0
1717
RUN npm i [email protected]
1818
COPY .markdownlint.json .
1919
COPY ./CHANGELOG.md ./CHANGELOG.md

‎Makefile‎

Lines changed: 7 additions & 7 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 2023-09-11T14:47:35Z by kres 8540947-dirty.
3+
# Generated on 2023-10-30T17:28:15Z by kres latest.
44

55
# common variables
66

@@ -16,13 +16,13 @@ USERNAME ?= siderolabs
1616
REGISTRY_AND_USERNAME ?= $(REGISTRY)/$(USERNAME)
1717
PROTOBUF_GO_VERSION ?= 1.31.0
1818
GRPC_GO_VERSION ?= 1.3.0
19-
GRPC_GATEWAY_VERSION ?= 2.17.1
20-
VTPROTOBUF_VERSION ?= 0.4.0
19+
GRPC_GATEWAY_VERSION ?= 2.18.0
20+
VTPROTOBUF_VERSION ?= 0.5.0
2121
DEEPCOPY_VERSION ?= v0.5.5
22-
GOLANGCILINT_VERSION ?= v1.54.2
22+
GOLANGCILINT_VERSION ?= v1.55.1
2323
GOFUMPT_VERSION ?= v0.5.0
24-
GO_VERSION ?= 1.21
25-
GOIMPORTS_VERSION ?= v0.12.0
24+
GO_VERSION ?= 1.21.3
25+
GOIMPORTS_VERSION ?= v0.14.0
2626
GO_BUILDFLAGS ?=
2727
GO_LDFLAGS ?=
2828
CGO_ENABLED ?= 0
@@ -222,7 +222,7 @@ integration: integration.test bldr
222222
.PHONY: rekres
223223
rekres:
224224
@docker pull $(KRES_IMAGE)
225-
@docker run --rm -v $(PWD):/src -w /src -e GITHUB_TOKEN $(KRES_IMAGE)
225+
@docker run --rm --net=host -v $(PWD):/src -w /src -e GITHUB_TOKEN $(KRES_IMAGE)
226226

227227
.PHONY: help
228228
help: ## This help menu.

‎go.mod‎

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -6,29 +6,28 @@ require (
66
github.com/Masterminds/semver v1.5.0
77
github.com/Masterminds/sprig/v3 v3.2.3
88
github.com/alessio/shellescape v1.4.2
9-
github.com/containerd/containerd v1.7.6
9+
github.com/containerd/containerd v1.7.8
1010
github.com/emicklei/dot v1.6.0
11-
github.com/google/go-github/v52 v52.0.1-0.20230514113659-60429b4ba0ba
11+
github.com/google/go-github/v56 v56.0.0
1212
github.com/hashicorp/go-multierror v1.1.1
13-
github.com/moby/buildkit v0.12.2
13+
github.com/moby/buildkit v0.12.3
1414
github.com/opencontainers/go-digest v1.0.0
15-
github.com/opencontainers/image-spec v1.1.0-rc3
16-
github.com/otiai10/copy v1.12.0
15+
github.com/opencontainers/image-spec v1.1.0-rc5
16+
github.com/otiai10/copy v1.14.0
1717
github.com/spf13/cobra v1.7.0
1818
github.com/stretchr/testify v1.8.4
19-
golang.org/x/oauth2 v0.12.0
20-
golang.org/x/sync v0.3.0
19+
golang.org/x/oauth2 v0.13.0
20+
golang.org/x/sync v0.4.0
2121
gopkg.in/yaml.v3 v3.0.1
2222
)
2323

2424
require (
2525
github.com/Masterminds/goutils v1.1.1 // indirect
2626
github.com/Masterminds/semver/v3 v3.2.0 // indirect
2727
github.com/Microsoft/go-winio v0.6.1 // indirect
28-
github.com/Microsoft/hcsshim v0.11.0 // indirect
29-
github.com/ProtonMail/go-crypto v0.0.0-20230217124315-7d5c6f04bbb8 // indirect
30-
github.com/cloudflare/circl v1.3.3 // indirect
28+
github.com/Microsoft/hcsshim v0.11.1 // indirect
3129
github.com/containerd/continuity v0.4.2 // indirect
30+
github.com/containerd/log v0.1.0 // indirect
3231
github.com/containerd/typeurl/v2 v2.1.1 // indirect
3332
github.com/davecgh/go-spew v1.1.1 // indirect
3433
github.com/docker/distribution v2.8.2+incompatible // indirect
@@ -50,21 +49,21 @@ require (
5049
github.com/pkg/errors v0.9.1 // indirect
5150
github.com/pmezard/go-difflib v1.0.0 // indirect
5251
github.com/shopspring/decimal v1.2.0 // indirect
53-
github.com/sirupsen/logrus v1.9.0 // indirect
52+
github.com/sirupsen/logrus v1.9.3 // indirect
5453
github.com/spf13/cast v1.3.1 // indirect
5554
github.com/spf13/pflag v1.0.5 // indirect
5655
github.com/tonistiigi/fsutil v0.0.0-20230629203738-36ef4d8c0dbb // indirect
5756
go.opentelemetry.io/otel v1.14.0 // indirect
5857
go.opentelemetry.io/otel/trace v1.14.0 // indirect
59-
golang.org/x/crypto v0.13.0 // indirect
60-
golang.org/x/mod v0.9.0 // indirect
61-
golang.org/x/net v0.15.0 // indirect
62-
golang.org/x/sys v0.12.0 // indirect
58+
golang.org/x/crypto v0.14.0 // indirect
59+
golang.org/x/mod v0.11.0 // indirect
60+
golang.org/x/net v0.17.0 // indirect
61+
golang.org/x/sys v0.13.0 // indirect
6362
golang.org/x/text v0.13.0 // indirect
64-
golang.org/x/tools v0.7.0 // indirect
63+
golang.org/x/tools v0.10.0 // indirect
6564
google.golang.org/appengine v1.6.7 // indirect
66-
google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4 // indirect
67-
google.golang.org/grpc v1.53.0 // indirect
65+
google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 // indirect
66+
google.golang.org/grpc v1.58.3 // indirect
6867
google.golang.org/protobuf v1.31.0 // indirect
6968
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
7069
)

0 commit comments

Comments
 (0)