Skip to content

Commit 9dcf9fa

Browse files
smirasmira
committed
fix: support another git diff output
Support format like: ``` --- i/Pkgfile +++ w/Pkgfile ``` Signed-off-by: Andrey Smirnov <[email protected]>
1 parent 6dde8d7 commit 9dcf9fa

File tree

10 files changed

+50
-48
lines changed

10 files changed

+50
-48
lines changed

‎.github/workflows/ci.yaml‎

Lines changed: 4 additions & 4 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-09-15T14:59:48Z by kres d1c95db.
3+
# Generated on 2025-09-29T13:07:19Z by kres fdbc9fc.
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.3.1
34+
uses: kenchan0130/actions-system-info@v1.4.0
3535
continue-on-error: true
3636
- name: print-system-info
3737
run: |
@@ -122,7 +122,7 @@ jobs:
122122
steps:
123123
- name: gather-system-info
124124
id: system-info
125-
uses: kenchan0130/actions-system-info@v1.3.1
125+
uses: kenchan0130/actions-system-info@v1.4.0
126126
continue-on-error: true
127127
- name: print-system-info
128128
run: |
@@ -169,7 +169,7 @@ jobs:
169169
steps:
170170
- name: gather-system-info
171171
id: system-info
172-
uses: kenchan0130/actions-system-info@v1.3.1
172+
uses: kenchan0130/actions-system-info@v1.4.0
173173
continue-on-error: true
174174
- name: print-system-info
175175
run: |

‎.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-07-15T11:42:33Z by kres c691b83.
3+
# Generated on 2025-09-29T13:07:19Z by kres fdbc9fc.
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@v9.1.0
18+
uses: actions/stale@v10.0.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"

‎Dockerfile‎

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

33
# THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT.
44
#
5-
# Generated on 2025-08-20T12:12:40Z by kres 18c31cf.
5+
# Generated on 2025-09-29T13:07:19Z by kres fdbc9fc.
66

77
ARG TOOLCHAIN
88

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

1313
# runs markdownlint
14-
FROM docker.io/oven/bun:1.2.20-alpine AS lint-markdown
14+
FROM docker.io/oven/bun:1.2.22-alpine AS lint-markdown
1515
WORKDIR /src
1616
RUN bun i [email protected] [email protected]
1717
COPY .markdownlint.json .

‎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 2025-09-15T14:59:48Z by kres d1c95db.
3+
# Generated on 2025-09-29T13:07:19Z by kres fdbc9fc.
44

55
# common variables
66

@@ -17,16 +17,16 @@ WITH_RACE ?= false
1717
REGISTRY ?= ghcr.io
1818
USERNAME ?= siderolabs
1919
REGISTRY_AND_USERNAME ?= $(REGISTRY)/$(USERNAME)
20-
PROTOBUF_GO_VERSION ?= 1.36.7
20+
PROTOBUF_GO_VERSION ?= 1.36.9
2121
GRPC_GO_VERSION ?= 1.5.1
22-
GRPC_GATEWAY_VERSION ?= 2.27.1
22+
GRPC_GATEWAY_VERSION ?= 2.27.2
2323
VTPROTOBUF_VERSION ?= 0.6.0
24-
GOIMPORTS_VERSION ?= 0.36.0
24+
GOIMPORTS_VERSION ?= 0.37.0
2525
GOMOCK_VERSION ?= 0.6.0
2626
DEEPCOPY_VERSION ?= v0.5.8
2727
GOLANGCILINT_VERSION ?= v2.4.0
28-
GOFUMPT_VERSION ?= v0.8.0
29-
GO_VERSION ?= 1.25.0
28+
GOFUMPT_VERSION ?= v0.9.1
29+
GO_VERSION ?= 1.25.1
3030
GO_BUILDFLAGS ?=
3131
GO_LDFLAGS ?=
3232
CGO_ENABLED ?= 0

‎cmd/bldr/cmd/update.go‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,8 @@ func diffUpdater(ctx context.Context) {
7575
switch {
7676
case strings.HasPrefix(line, "+++ b/"):
7777
currentPath = strings.TrimPrefix(line, "+++ b/")
78+
case strings.HasPrefix(line, "+++ w/"):
79+
currentPath = strings.TrimPrefix(line, "+++ w/")
7880
case strings.HasPrefix(line, "+"):
7981
variableName, _, ok := strings.Cut(strings.TrimPrefix(line, "+"), ": ")
8082
if !ok {

‎go.mod‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,17 @@ require (
99
github.com/anchore/syft v1.28.0
1010
github.com/cheggaaa/pb/v3 v3.1.7
1111
github.com/containerd/platforms v1.0.0-rc.1
12-
github.com/emicklei/dot v1.9.0
12+
github.com/emicklei/dot v1.9.1
1313
github.com/hashicorp/go-multierror v1.1.1
14-
github.com/moby/buildkit v0.23.2
14+
github.com/moby/buildkit v0.24.0
1515
github.com/moby/docker-image-spec v1.3.1
1616
github.com/opencontainers/go-digest v1.0.0
1717
github.com/opencontainers/image-spec v1.1.1
1818
github.com/otiai10/copy v1.14.1
1919
github.com/siderolabs/gen v0.8.5
20-
github.com/spf13/cobra v1.9.1
21-
github.com/stretchr/testify v1.10.0
22-
golang.org/x/sync v0.16.0
20+
github.com/spf13/cobra v1.10.1
21+
github.com/stretchr/testify v1.11.1
22+
golang.org/x/sync v0.17.0
2323
gopkg.in/yaml.v3 v3.0.1
2424
)
2525

@@ -66,15 +66,15 @@ require (
6666
github.com/charmbracelet/x/cellbuf v0.0.13 // indirect
6767
github.com/charmbracelet/x/term v0.2.1 // indirect
6868
github.com/cncf/xds/go v0.0.0-20250501225837-2ac532fd4443 // indirect
69-
github.com/containerd/containerd/v2 v2.1.3 // indirect
69+
github.com/containerd/containerd/v2 v2.1.4 // indirect
7070
github.com/containerd/errdefs v1.0.0 // indirect
7171
github.com/containerd/log v0.1.0 // indirect
7272
github.com/containerd/ttrpc v1.2.7 // indirect
7373
github.com/containerd/typeurl/v2 v2.2.3 // indirect
7474
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
7575
github.com/diskfs/go-diskfs v1.6.1-0.20250601133945-2af1c7ece24c // indirect
7676
github.com/distribution/reference v0.6.0 // indirect
77-
github.com/docker/cli v28.3.1+incompatible // indirect
77+
github.com/docker/cli v28.3.3+incompatible // indirect
7878
github.com/docker/docker-credential-helpers v0.9.3 // indirect
7979
github.com/docker/go-connections v0.5.0 // indirect
8080
github.com/docker/go-events v0.0.0-20250114142523-c867878c5e32 // indirect
@@ -155,14 +155,14 @@ require (
155155
github.com/spdx/tools-golang v0.5.5 // indirect
156156
github.com/spf13/afero v1.14.0 // indirect
157157
github.com/spf13/cast v1.9.2 // indirect
158-
github.com/spf13/pflag v1.0.6 // indirect
158+
github.com/spf13/pflag v1.0.9 // indirect
159159
github.com/spf13/viper v1.20.1 // indirect
160160
github.com/spiffe/go-spiffe/v2 v2.5.0 // indirect
161161
github.com/subosito/gotenv v1.6.0 // indirect
162162
github.com/sylabs/squashfs v1.0.6 // indirect
163163
github.com/therootcompany/xz v1.0.1 // indirect
164164
github.com/tonistiigi/fsutil v0.0.0-20250605211040-586307ad452f // indirect
165-
github.com/ulikunitz/xz v0.5.12 // indirect
165+
github.com/ulikunitz/xz v0.5.15 // indirect
166166
github.com/wagoodman/go-partybus v0.0.0-20230516145632-8ccac152c651 // indirect
167167
github.com/wagoodman/go-progress v0.0.0-20230925121702-07e42b3cdba0 // indirect
168168
github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 // indirect

‎go.sum‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -781,8 +781,8 @@ github.com/containerd/containerd v1.7.27 h1:yFyEyojddO3MIGVER2xJLWoCIn+Up4GaHFqu
781781
github.com/containerd/containerd v1.7.27/go.mod h1:xZmPnl75Vc+BLGt4MIfu6bp+fy03gdHAn9bz+FreFR0=
782782
github.com/containerd/containerd/api v1.9.0 h1:HZ/licowTRazus+wt9fM6r/9BQO7S0vD5lMcWspGIg0=
783783
github.com/containerd/containerd/api v1.9.0/go.mod h1:GhghKFmTR3hNtyznBoQ0EMWr9ju5AqHjcZPsSpTKutI=
784-
github.com/containerd/containerd/v2 v2.1.3 h1:eMD2SLcIQPdMlnlNF6fatlrlRLAeDaiGPGwmRKLZKNs=
785-
github.com/containerd/containerd/v2 v2.1.3/go.mod h1:8C5QV9djwsYDNhxfTCFjWtTBZrqjditQ4/ghHSYjnHM=
784+
github.com/containerd/containerd/v2 v2.1.4 h1:/hXWjiSFd6ftrBOBGfAZ6T30LJcx1dBjdKEeI8xucKQ=
785+
github.com/containerd/containerd/v2 v2.1.4/go.mod h1:8C5QV9djwsYDNhxfTCFjWtTBZrqjditQ4/ghHSYjnHM=
786786
github.com/containerd/continuity v0.4.5 h1:ZRoN1sXq9u7V6QoHMcVWGhOwDFqZ4B9i5H6un1Wh0x4=
787787
github.com/containerd/continuity v0.4.5/go.mod h1:/lNJvtJKUQStBzpVQ1+rasXO1LAWtUQssk28EZvJ3nE=
788788
github.com/containerd/errdefs v1.0.0 h1:tg5yIfIlQIrxYtu9ajqY42W3lpS19XqdxRQeEwYG8PI=
@@ -816,12 +816,12 @@ github.com/diskfs/go-diskfs v1.6.1-0.20250601133945-2af1c7ece24c h1:Vg+RNk+3Kwbe
816816
github.com/diskfs/go-diskfs v1.6.1-0.20250601133945-2af1c7ece24c/go.mod h1:LhQyXqOugWFRahYUSw47NyZJPezFzB9UELwhpszLP/k=
817817
github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk=
818818
github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E=
819-
github.com/docker/cli v28.3.1+incompatible h1:ZUdwOLDEBoE3TE5rdC9IXGY5HPHksJK3M+hJEWhh2mc=
820-
github.com/docker/cli v28.3.1+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
819+
github.com/docker/cli v28.3.3+incompatible h1:fp9ZHAr1WWPGdIWBM1b3zLtgCF+83gRdVMTJsUeiyAo=
820+
github.com/docker/cli v28.3.3+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
821821
github.com/docker/distribution v2.8.3+incompatible h1:AtKxIZ36LoNK51+Z6RpzLpddBirtxJnzDrHLEKxTAYk=
822822
github.com/docker/distribution v2.8.3+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
823-
github.com/docker/docker v28.2.2+incompatible h1:CjwRSksz8Yo4+RmQ339Dp/D2tGO5JxwYeqtMOEe0LDw=
824-
github.com/docker/docker v28.2.2+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
823+
github.com/docker/docker v28.3.3+incompatible h1:Dypm25kh4rmk49v1eiVbsAtpAsYURjYkaKubwuBdxEI=
824+
github.com/docker/docker v28.3.3+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
825825
github.com/docker/docker-credential-helpers v0.9.3 h1:gAm/VtF9wgqJMoxzT3Gj5p4AqIjCBS4wrsOh9yRqcz8=
826826
github.com/docker/docker-credential-helpers v0.9.3/go.mod h1:x+4Gbw9aGmChi3qTLZj8Dfn0TD20M/fuWy0E5+WDeCo=
827827
github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj1Br63c=
@@ -837,8 +837,8 @@ github.com/dsnet/golib v0.0.0-20171103203638-1ea166775780/go.mod h1:Lj+Z9rebOhdf
837837
github.com/dsseng/syft v0.0.0-20250703101014-f39c35d156d9 h1:F2TgPiZHAa6Rr7OMBk//WEKlG0HZ2wGya6T37hsJ1k8=
838838
github.com/dsseng/syft v0.0.0-20250703101014-f39c35d156d9/go.mod h1:jGpfAy5lRvOUrOxWAfbbu9t3TK8VwJpAAJHz6HFQofw=
839839
github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
840-
github.com/emicklei/dot v1.9.0 h1:FyaJNctdMfaEIbTQ1FkKZ1UCZyJJSkyvkrXOVoNZPKU=
841-
github.com/emicklei/dot v1.9.0/go.mod h1:DeV7GvQtIw4h2u73RKBkkFdvVAz0D9fzeJrgPW6gy/s=
840+
github.com/emicklei/dot v1.9.1 h1:SBySmOPaQ6+fpmnqEaG1bCHj5hW65A0jJpcPpz+TG3w=
841+
github.com/emicklei/dot v1.9.1/go.mod h1:DeV7GvQtIw4h2u73RKBkkFdvVAz0D9fzeJrgPW6gy/s=
842842
github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
843843
github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
844844
github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
@@ -1215,8 +1215,8 @@ github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh
12151215
github.com/mitchellh/mapstructure v1.4.3/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
12161216
github.com/mitchellh/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zxSIeXaQ=
12171217
github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw=
1218-
github.com/moby/buildkit v0.23.2 h1:gt/dkfcpgTXKx+B9I310kV767hhVqTvEyxGgI3mqsGQ=
1219-
github.com/moby/buildkit v0.23.2/go.mod h1:iEjAfPQKIuO+8y6OcInInvzqTMiKMbb2RdJz1K/95a0=
1218+
github.com/moby/buildkit v0.24.0 h1:qYfTl7W1SIJzWDIDCcPT8FboHIZCYfi++wvySi3eyFE=
1219+
github.com/moby/buildkit v0.24.0/go.mod h1:4qovICAdR2H4C7+EGMRva5zgHW1gyhT4/flHI7F5F9k=
12201220
github.com/moby/docker-image-spec v1.3.1 h1:jMKff3w6PgbfSa69GfNg+zN/XLhfXJGnEx3Nl2EsFP0=
12211221
github.com/moby/docker-image-spec v1.3.1/go.mod h1:eKmb5VW8vQEh/BAr2yvVNvuiJuY6UIocYsFu/DxxRpo=
12221222
github.com/moby/locker v1.0.1 h1:fOXqR41zeveg4fFODix+1Ch4mj/gT0NE1XJbp/epuBg=
@@ -1363,12 +1363,12 @@ github.com/spf13/cast v1.4.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkU
13631363
github.com/spf13/cast v1.9.2 h1:SsGfm7M8QOFtEzumm7UZrZdLLquNdzFYfIbEXntcFbE=
13641364
github.com/spf13/cast v1.9.2/go.mod h1:jNfB8QC9IA6ZuY2ZjDp0KtFO2LZZlg4S/7bzP6qqeHo=
13651365
github.com/spf13/cobra v1.3.0/go.mod h1:BrRVncBjOJa/eUcVVm9CE+oC6as8k+VYr4NY7WCi9V4=
1366-
github.com/spf13/cobra v1.9.1 h1:CXSaggrXdbHK9CF+8ywj8Amf7PBRmPCOJugH954Nnlo=
1367-
github.com/spf13/cobra v1.9.1/go.mod h1:nDyEzZ8ogv936Cinf6g1RU9MRY64Ir93oCnqb9wxYW0=
1366+
github.com/spf13/cobra v1.10.1 h1:lJeBwCfmrnXthfAupyUTzJ/J4Nc1RsHC/mSRU2dll/s=
1367+
github.com/spf13/cobra v1.10.1/go.mod h1:7SmJGaTHFVBY0jW4NXGluQoLvhqFQM+6XSKD+P4XaB0=
13681368
github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo=
13691369
github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
1370-
github.com/spf13/pflag v1.0.6 h1:jFzHGLGAlb3ruxLB8MhbI6A8+AQX/2eW4qeyNZXNp2o=
1371-
github.com/spf13/pflag v1.0.6/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
1370+
github.com/spf13/pflag v1.0.9 h1:9exaQaMOCwffKiiiYk6/BndUBv+iRViNW+4lEMi0PvY=
1371+
github.com/spf13/pflag v1.0.9/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
13721372
github.com/spf13/viper v1.10.0/go.mod h1:SoyBPwAtKDzypXNDFKN5kzH7ppppbGZtls1UpIy5AsM=
13731373
github.com/spf13/viper v1.20.1 h1:ZMi+z/lvLyPSCoNtFCpqjy0S4kPbirhpTMwl8BkW9X4=
13741374
github.com/spf13/viper v1.20.1/go.mod h1:P9Mdzt1zoHIG8m2eZQinpiBjo6kCmZSKBClNNqjJvu4=
@@ -1392,8 +1392,8 @@ github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o
13921392
github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
13931393
github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
13941394
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
1395-
github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
1396-
github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
1395+
github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
1396+
github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
13971397
github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw=
13981398
github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8=
13991399
github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU=
@@ -1410,8 +1410,8 @@ github.com/tonistiigi/fsutil v0.0.0-20250605211040-586307ad452f/go.mod h1:BKdcez
14101410
github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM=
14111411
github.com/ulikunitz/xz v0.5.8/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
14121412
github.com/ulikunitz/xz v0.5.10/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
1413-
github.com/ulikunitz/xz v0.5.12 h1:37Nm15o69RwBkXM0J6A5OlE67RZTfzUxTj8fB3dfcsc=
1414-
github.com/ulikunitz/xz v0.5.12/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
1413+
github.com/ulikunitz/xz v0.5.15 h1:9DNdB5s+SgV3bQ2ApL10xRc35ck0DuIX/isZvIk+ubY=
1414+
github.com/ulikunitz/xz v0.5.15/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
14151415
github.com/vbatts/tar-split v0.12.1 h1:CqKoORW7BUWBe7UL/iqTVvkTBOF8UvOMKOIZykxnnbo=
14161416
github.com/vbatts/tar-split v0.12.1/go.mod h1:eF6B6i6ftWQcDqEn3/iGFRFRo8cBIMSJVOpnNdfTMFA=
14171417
github.com/wagoodman/go-partybus v0.0.0-20230516145632-8ccac152c651 h1:jIVmlAFIqV3d+DOxazTR9v+zgj8+VYuQBzPgBZvWBHA=
@@ -1687,8 +1687,8 @@ golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
16871687
golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
16881688
golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
16891689
golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
1690-
golang.org/x/sync v0.16.0 h1:ycBJEhp9p4vXvUZNszeOq0kGTPghopOL8q0fq3vstxw=
1691-
golang.org/x/sync v0.16.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
1690+
golang.org/x/sync v0.17.0 h1:l60nONMj9l5drqw6jlhIELNv9I0A4OFgRsG9k2oT9Ug=
1691+
golang.org/x/sync v0.17.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
16921692
golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
16931693
golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
16941694
golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=

‎internal/pkg/solver/graph.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ func (node *PackageNode) RuntimeDependencies() (deps []PackageDependency) {
9494
}
9595
}
9696

97-
return
97+
return deps
9898
}
9999

100100
// PackageGraph capture root of the DAG.

‎internal/pkg/solver/packages.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ func (pkgs *Packages) ToSet() (set PackageSet) {
120120
})
121121
}
122122

123-
return
123+
return set
124124
}
125125

126126
// ImageLabels returns set of image labels to apply to the output image.

‎internal/pkg/util/testutil/manifest.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,12 @@ func NewTestManifest(path string) (manifest TestManifest, err error) {
3333

3434
f, err = os.Open(path)
3535
if err != nil {
36-
return
36+
return manifest, err
3737
}
3838

3939
defer f.Close() //nolint:errcheck
4040

4141
err = yaml.NewDecoder(f).Decode(&manifest)
4242

43-
return
43+
return manifest, err
4444
}

0 commit comments

Comments
 (0)