Skip to content

Commit 9a526ec

Browse files
author
Dmitriy Matrenichev
committed
chore: bump deps
Bump deps: - run rekres - github.com/google/go-github to v63.0.0 - github.com/containerd/containerd v1.7.20 - github.com/google/go-github/v63 v63.0.0 - github.com/moby/buildkit v0.15.1 - github.com/siderolabs/gen v0.5.0 - github.com/spf13/cobra v1.8.1 - golang.org/x/oauth2 v0.22.0 - golang.org/x/sync v0.8.0 Signed-off-by: Dmitriy Matrenichev <[email protected]>
1 parent 7f6df03 commit 9a526ec

File tree

10 files changed

+111
-170
lines changed

10 files changed

+111
-170
lines changed

‎.github/workflows/ci.yaml‎

Lines changed: 4 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-05-23T12:22:27Z by kres 2688b70.
3+
# Generated on 2024-08-05T10:23:31Z by kres faf91e3.
44

55
name: default
66
concurrency:
@@ -113,8 +113,9 @@ jobs:
113113
- name: Generate Checksums
114114
if: startsWith(github.ref, 'refs/tags/')
115115
run: |
116-
sha256sum _out/bldr-* > _out/sha256sum.txt
117-
sha512sum _out/bldr-* > _out/sha512sum.txt
116+
cd _out
117+
sha256sum bldr-* > sha256sum.txt
118+
sha512sum bldr-* > sha512sum.txt
118119
- name: release-notes
119120
if: startsWith(github.ref, 'refs/tags/')
120121
run: |

‎.golangci.yml‎

Lines changed: 13 additions & 22 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-05-23T12:22:27Z by kres 2688b70.
3+
# Generated on 2024-08-05T10:23:31Z by kres faf91e3.
44

55
# options for analysis running
66
run:
@@ -13,8 +13,8 @@ run:
1313
# output configuration options
1414
output:
1515
formats:
16-
- format: colored-line-number
17-
path: stdout
16+
- format: colored-line-number
17+
path: stdout
1818
print-issued-lines: true
1919
print-linter-name: true
2020
uniq-by-line: true
@@ -94,17 +94,21 @@ linters-settings:
9494
cyclop:
9595
# the maximal code complexity to report
9696
max-complexity: 20
97-
# depguard:
98-
# Main:
99-
# deny:
100-
# - github.com/OpenPeeDeeP/depguard # this is just an example
97+
depguard:
98+
rules:
99+
prevent_unmaintained_packages:
100+
list-mode: lax # allow unless explicitly denied
101+
files:
102+
- $all
103+
deny:
104+
- pkg: io/ioutil
105+
desc: "replaced by io and os packages since Go 1.16: https://tip.golang.org/doc/go1.16#ioutil"
101106

102107
linters:
103108
enable-all: true
104109
disable-all: false
105110
fast: false
106111
disable:
107-
- exhaustivestruct
108112
- exhaustruct
109113
- err113
110114
- forbidigo
@@ -120,30 +124,17 @@ linters:
120124
- mnd
121125
- nestif
122126
- nonamedreturns
123-
- nosnakecase
124127
- paralleltest
125128
- tagalign
126129
- tagliatelle
127130
- thelper
128-
- typecheck
129131
- varnamelen
130132
- wrapcheck
131-
- depguard # Disabled because starting with golangci-lint 1.53.0 it doesn't allow denylist alone anymore
132133
- testifylint # complains about our assert recorder and has a number of false positives for assert.Greater(t, thing, 1)
133134
- protogetter # complains about us using Value field on typed spec, instead of GetValue which has a different signature
134135
- perfsprint # complains about us using fmt.Sprintf in non-performance critical code, updating just kres took too long
135-
# abandoned linters for which golangci shows the warning that the repo is archived by the owner
136-
- deadcode
137-
- golint
138-
- ifshort
139-
- interfacer
140-
- maligned
141-
- scopelint
142-
- structcheck
143-
- varcheck
144-
# disabled as it seems to be broken - goes into imported libraries and reports issues there
145-
- musttag
146136
- goimports # same as gci
137+
- musttag # seems to be broken - goes into imported libraries and reports issues there
147138

148139
issues:
149140
exclude: [ ]

‎Dockerfile‎

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
# syntax = docker/dockerfile-upstream:1.7.1-labs
1+
# syntax = docker/dockerfile-upstream:1.9.0-labs
22

33
# THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT.
44
#
5-
# Generated on 2024-05-23T12:22:27Z by kres 2688b70.
5+
# Generated on 2024-08-05T10:23:31Z by kres faf91e3.
66

77
ARG TOOLCHAIN
88

@@ -11,29 +11,28 @@ FROM ghcr.io/siderolabs/ca-certificates:v1.7.0 AS image-ca-certificates
1111
FROM ghcr.io/siderolabs/fhs:v1.7.0 AS image-fhs
1212

1313
# runs markdownlint
14-
FROM docker.io/node:22.2.0-alpine3.19 AS lint-markdown
14+
FROM docker.io/oven/bun:1.1.20-alpine AS lint-markdown
1515
WORKDIR /src
16-
RUN npm i -g [email protected]
17-
RUN npm i [email protected]
16+
RUN bun i [email protected] [email protected]
1817
COPY .markdownlint.json .
1918
COPY ./CHANGELOG.md ./CHANGELOG.md
2019
COPY ./README.md ./README.md
21-
RUN markdownlint --ignore "CHANGELOG.md" --ignore "**/node_modules/**" --ignore '**/hack/chglog/**' --rules node_modules/sentences-per-line/index.js .
20+
RUN bunx markdownlint --ignore "CHANGELOG.md" --ignore "**/node_modules/**" --ignore '**/hack/chglog/**' --rules node_modules/sentences-per-line/index.js .
2221

2322
# base toolchain image
2423
FROM --platform=${BUILDPLATFORM} ${TOOLCHAIN} AS toolchain
2524
RUN apk --update --no-cache add bash curl build-base protoc protobuf-dev
2625

2726
# build tools
2827
FROM --platform=${BUILDPLATFORM} toolchain AS tools
29-
ENV GO111MODULE on
28+
ENV GO111MODULE=on
3029
ARG CGO_ENABLED
31-
ENV CGO_ENABLED ${CGO_ENABLED}
30+
ENV CGO_ENABLED=${CGO_ENABLED}
3231
ARG GOTOOLCHAIN
33-
ENV GOTOOLCHAIN ${GOTOOLCHAIN}
32+
ENV GOTOOLCHAIN=${GOTOOLCHAIN}
3433
ARG GOEXPERIMENT
35-
ENV GOEXPERIMENT ${GOEXPERIMENT}
36-
ENV GOPATH /go
34+
ENV GOEXPERIMENT=${GOEXPERIMENT}
35+
ENV GOPATH=/go
3736
ARG DEEPCOPY_VERSION
3837
RUN --mount=type=cache,target=/root/.cache/go-build --mount=type=cache,target=/go/pkg go install github.com/siderolabs/deep-copy@${DEEPCOPY_VERSION} \
3938
&& mv /go/bin/deep-copy /bin/deep-copy
@@ -82,7 +81,7 @@ RUN FILES="$(gofumpt -l .)" && test -z "${FILES}" || (echo -e "Source code is no
8281
FROM base AS lint-golangci-lint
8382
WORKDIR /src
8483
COPY .golangci.yml .
85-
ENV GOGC 50
84+
ENV GOGC=50
8685
RUN golangci-lint config verify --config .golangci.yml
8786
RUN --mount=type=cache,target=/root/.cache/go-build --mount=type=cache,target=/root/.cache/golangci-lint --mount=type=cache,target=/go/pkg golangci-lint run --config .golangci.yml
8887

@@ -193,6 +192,6 @@ ARG TARGETARCH
193192
COPY --from=bldr bldr-linux-${TARGETARCH} /bldr
194193
COPY --from=image-fhs / /
195194
COPY --from=image-ca-certificates / /
196-
LABEL org.opencontainers.image.source https://github.com/siderolabs/bldr
195+
LABEL org.opencontainers.image.source=https://github.com/siderolabs/bldr
197196
ENTRYPOINT ["/bldr","frontend"]
198197

‎Makefile‎

Lines changed: 6 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-05-23T12:22:27Z by kres 2688b70.
3+
# Generated on 2024-08-05T10:23:31Z by kres faf91e3.
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.1
21-
GRPC_GO_VERSION ?= 1.3.0
20+
PROTOBUF_GO_VERSION ?= 1.34.2
21+
GRPC_GO_VERSION ?= 1.4.0
2222
GRPC_GATEWAY_VERSION ?= 2.20.0
2323
VTPROTOBUF_VERSION ?= 0.6.0
24-
GOIMPORTS_VERSION ?= 0.21.0
24+
GOIMPORTS_VERSION ?= 0.23.0
2525
DEEPCOPY_VERSION ?= v0.5.6
26-
GOLANGCILINT_VERSION ?= v1.58.2
26+
GOLANGCILINT_VERSION ?= v1.59.1
2727
GOFUMPT_VERSION ?= v0.6.0
28-
GO_VERSION ?= 1.22.3
28+
GO_VERSION ?= 1.22.5
2929
GO_BUILDFLAGS ?=
3030
GO_LDFLAGS ?=
3131
CGO_ENABLED ?= 0

‎cmd/bldr/cmd/update.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ func checkUpdates(ctx context.Context, set solver.PackageSet, l *log.Logger) err
9696
sort.Slice(res, func(i, j int) bool { return res[i].file < res[j].file })
9797

9898
w := tabwriter.NewWriter(os.Stdout, 0, 0, 3, ' ', 0)
99-
fmt.Fprintf(w, "%s\t%s\t%s\n", "File", "Update", "URL")
99+
fmt.Fprintf(w, "%s\t%s\t%s\n", "File", "Update", "URL") //nolint:errcheck
100100

101101
for _, info := range res {
102102
if updateCmdFlag.all || info.HasUpdate {
@@ -105,7 +105,7 @@ func checkUpdates(ctx context.Context, set solver.PackageSet, l *log.Logger) err
105105
url = info.BaseURL
106106
}
107107

108-
fmt.Fprintf(w, "%s\t%t\t%s\n", info.file, info.HasUpdate, url)
108+
fmt.Fprintf(w, "%s\t%t\t%s\n", info.file, info.HasUpdate, url) //nolint:errcheck
109109
}
110110
}
111111

‎go.mod‎

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -5,52 +5,51 @@ go 1.22.3
55
require (
66
github.com/Masterminds/semver v1.5.0
77
github.com/Masterminds/sprig/v3 v3.2.3
8-
github.com/containerd/containerd v1.7.17
8+
github.com/containerd/platforms v0.2.1
99
github.com/emicklei/dot v1.6.2
10-
github.com/google/go-github/v62 v62.0.0
10+
github.com/google/go-github/v63 v63.0.0
1111
github.com/hashicorp/go-multierror v1.1.1
12-
github.com/moby/buildkit v0.13.2
12+
github.com/moby/buildkit v0.15.1
1313
github.com/moby/docker-image-spec v1.3.1
1414
github.com/opencontainers/go-digest v1.0.0
1515
github.com/opencontainers/image-spec v1.1.0
1616
github.com/otiai10/copy v1.14.0
17-
github.com/siderolabs/gen v0.4.8
18-
github.com/spf13/cobra v1.8.0
17+
github.com/siderolabs/gen v0.5.0
18+
github.com/spf13/cobra v1.8.1
1919
github.com/stretchr/testify v1.9.0
20-
golang.org/x/oauth2 v0.20.0
21-
golang.org/x/sync v0.7.0
20+
golang.org/x/oauth2 v0.22.0
21+
golang.org/x/sync v0.8.0
2222
gopkg.in/yaml.v3 v3.0.1
2323
)
2424

2525
require (
26-
cloud.google.com/go/compute/metadata v0.3.0 // indirect
2726
github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 // indirect
2827
github.com/Masterminds/goutils v1.1.1 // indirect
2928
github.com/Masterminds/semver/v3 v3.2.0 // indirect
3029
github.com/Microsoft/go-winio v0.6.2 // indirect
31-
github.com/Microsoft/hcsshim v0.11.5 // indirect
30+
github.com/containerd/containerd v1.7.20 // indirect
3231
github.com/containerd/continuity v0.4.3 // indirect
32+
github.com/containerd/errdefs v0.1.0 // indirect
3333
github.com/containerd/log v0.1.0 // indirect
34-
github.com/containerd/ttrpc v1.2.4 // indirect
34+
github.com/containerd/ttrpc v1.2.5 // indirect
3535
github.com/containerd/typeurl/v2 v2.1.1 // indirect
3636
github.com/davecgh/go-spew v1.1.1 // indirect
37-
github.com/distribution/reference v0.5.0 // indirect
37+
github.com/distribution/reference v0.6.0 // indirect
3838
github.com/felixge/httpsnoop v1.0.4 // indirect
39-
github.com/go-logr/logr v1.3.0 // indirect
39+
github.com/go-logr/logr v1.4.1 // indirect
4040
github.com/go-logr/stdr v1.2.2 // indirect
4141
github.com/gogo/googleapis v1.4.1 // indirect
4242
github.com/gogo/protobuf v1.3.2 // indirect
4343
github.com/golang/protobuf v1.5.4 // indirect
4444
github.com/google/go-querystring v1.1.0 // indirect
4545
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
46-
github.com/google/uuid v1.5.0 // indirect
47-
github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect
46+
github.com/google/uuid v1.6.0 // indirect
4847
github.com/hashicorp/errwrap v1.1.0 // indirect
4948
github.com/huandu/xstrings v1.3.3 // indirect
5049
github.com/imdario/mergo v0.3.13 // indirect
5150
github.com/in-toto/in-toto-golang v0.5.0 // indirect
5251
github.com/inconshreveable/mousetrap v1.1.0 // indirect
53-
github.com/klauspost/compress v1.17.4 // indirect
52+
github.com/klauspost/compress v1.17.9 // indirect
5453
github.com/kr/text v0.2.0 // indirect
5554
github.com/mitchellh/copystructure v1.0.0 // indirect
5655
github.com/mitchellh/reflectwalk v1.0.0 // indirect
@@ -66,15 +65,17 @@ require (
6665
github.com/spf13/pflag v1.0.5 // indirect
6766
github.com/tonistiigi/fsutil v0.0.0-20240424095704-91a3fc46842c // indirect
6867
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.1 // indirect
68+
go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.46.1 // indirect
6969
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1 // indirect
7070
go.opentelemetry.io/otel v1.21.0 // indirect
7171
go.opentelemetry.io/otel/metric v1.21.0 // indirect
72+
go.opentelemetry.io/otel/sdk v1.21.0 // indirect
7273
go.opentelemetry.io/otel/trace v1.21.0 // indirect
73-
golang.org/x/crypto v0.21.0 // indirect
74-
golang.org/x/net v0.23.0 // indirect
75-
golang.org/x/sys v0.18.0 // indirect
76-
golang.org/x/text v0.14.0 // indirect
77-
google.golang.org/genproto/googleapis/rpc v0.0.0-20231016165738-49dd2c1f3d0b // indirect
74+
golang.org/x/crypto v0.23.0 // indirect
75+
golang.org/x/net v0.25.0 // indirect
76+
golang.org/x/sys v0.22.0 // indirect
77+
golang.org/x/text v0.15.0 // indirect
78+
google.golang.org/genproto/googleapis/rpc v0.0.0-20231212172506-995d672761c0 // indirect
7879
google.golang.org/grpc v1.59.0 // indirect
7980
google.golang.org/protobuf v1.33.0 // indirect
8081
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect

0 commit comments

Comments
 (0)