Skip to content

Commit fad96f3

Browse files
committed
fix: bldr update with versions having dashes
Hopefully softwares don't have `^` in versions. Signed-off-by: Noel Georgi <[email protected]>
1 parent 9dcf9fa commit fad96f3

File tree

14 files changed

+110
-54
lines changed

14 files changed

+110
-54
lines changed

.github/workflows/ci.yaml

Lines changed: 51 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 2025-09-29T13:07:19Z by kres fdbc9fc.
3+
# Generated on 2025-11-06T11:34:13Z by kres 4ba9b0c.
44

55
concurrency:
66
group: ${{ github.head_ref || github.run_id }}
@@ -89,11 +89,6 @@ jobs:
8989
PUSH: "true"
9090
run: |
9191
make image-bldr
92-
- name: integration
93-
env:
94-
REGISTRY: registry.dev.siderolabs.io
95-
run: |
96-
make integration
9792
- name: Generate Checksums
9893
if: startsWith(github.ref, 'refs/tags/')
9994
run: |
@@ -106,13 +101,62 @@ jobs:
106101
make release-notes
107102
- name: Release
108103
if: startsWith(github.ref, 'refs/tags/')
109-
uses: crazy-max/ghaction-github-release@v2
104+
uses: softprops/action-gh-release@v2
110105
with:
111106
body_path: _out/RELEASE_NOTES.md
112107
draft: "true"
113108
files: |-
114109
_out/bldr-*
115110
_out/sha*.txt
111+
integration:
112+
runs-on:
113+
group: generic
114+
if: github.event_name == 'pull_request'
115+
needs:
116+
- default
117+
steps:
118+
- name: gather-system-info
119+
id: system-info
120+
uses: kenchan0130/[email protected]
121+
continue-on-error: true
122+
- name: print-system-info
123+
run: |
124+
MEMORY_GB=$((${{ steps.system-info.outputs.totalmem }}/1024/1024/1024))
125+
126+
OUTPUTS=(
127+
"CPU Core: ${{ steps.system-info.outputs.cpu-core }}"
128+
"CPU Model: ${{ steps.system-info.outputs.cpu-model }}"
129+
"Hostname: ${{ steps.system-info.outputs.hostname }}"
130+
"NodeName: ${NODE_NAME}"
131+
"Kernel release: ${{ steps.system-info.outputs.kernel-release }}"
132+
"Kernel version: ${{ steps.system-info.outputs.kernel-version }}"
133+
"Name: ${{ steps.system-info.outputs.name }}"
134+
"Platform: ${{ steps.system-info.outputs.platform }}"
135+
"Release: ${{ steps.system-info.outputs.release }}"
136+
"Total memory: ${MEMORY_GB} GB"
137+
)
138+
139+
for OUTPUT in "${OUTPUTS[@]}";do
140+
echo "${OUTPUT}"
141+
done
142+
continue-on-error: true
143+
- name: checkout
144+
uses: actions/checkout@v5
145+
- name: Unshallow
146+
run: |
147+
git fetch --prune --unshallow
148+
- name: Set up Docker Buildx
149+
id: setup-buildx
150+
uses: docker/setup-buildx-action@v3
151+
with:
152+
driver: remote
153+
endpoint: tcp://buildkit-amd64.ci.svc.cluster.local:1234
154+
timeout-minutes: 10
155+
- name: integration
156+
env:
157+
REGISTRY: registry.dev.siderolabs.io
158+
run: |
159+
make integration
116160
lint:
117161
runs-on:
118162
group: generic

.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-09-29T13:07:19Z by kres fdbc9fc.
3+
# Generated on 2025-11-06T11:19:01Z by kres 4ba9b0c.
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@v10.0.0
18+
uses: actions/stale@v10.1.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"

.kres.yaml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,12 @@ spec:
2424
GOOS: darwin
2525
GOARCH: arm64
2626
---
27+
# TODO: remove after syft upstream PR is merged. See https://github.com/anchore/syft/pull/4029
28+
kind: golang.GoVulnCheck
29+
spec:
30+
ignore:
31+
- GO-2025-4020
32+
---
2733
kind: service.CodeCov
2834
spec:
2935
targetThreshold: 1
@@ -98,6 +104,9 @@ spec:
98104
- cd internal/pkg/integration && PATH="$$PWD/../../../$(ARTIFACTS):$$PATH" integration.test -test.v -test.run $(RUN_TESTS)
99105
ghaction:
100106
enabled: true
107+
parallelJob:
108+
name: integration
109+
runnerGroup: generic
101110
environment:
102111
REGISTRY: registry.dev.siderolabs.io
103112
---

Dockerfile

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

33
# THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT.
44
#
5-
# Generated on 2025-09-29T13:07:19Z by kres fdbc9fc.
5+
# Generated on 2025-11-07T08:10:04Z by kres 4ba9b0c.
66

7-
ARG TOOLCHAIN
7+
ARG TOOLCHAIN=scratch
88

99
FROM ghcr.io/siderolabs/ca-certificates:v1.11.0 AS image-ca-certificates
1010

1111
FROM ghcr.io/siderolabs/fhs:v1.11.0 AS image-fhs
1212

1313
# runs markdownlint
14-
FROM docker.io/oven/bun:1.2.22-alpine AS lint-markdown
14+
FROM docker.io/oven/bun:1.3.0-alpine AS lint-markdown
1515
WORKDIR /src
1616
1717
COPY .markdownlint.json .
@@ -96,7 +96,7 @@ RUN --mount=type=cache,target=/root/.cache/go-build,id=bldr/root/.cache/go-build
9696
FROM base AS lint-govulncheck
9797
WORKDIR /src
9898
COPY --chmod=0755 hack/govulncheck.sh ./hack/govulncheck.sh
99-
RUN --mount=type=cache,target=/root/.cache/go-build,id=bldr/root/.cache/go-build --mount=type=cache,target=/go/pkg,id=bldr/go/pkg ./hack/govulncheck.sh ./...
99+
RUN --mount=type=cache,target=/root/.cache/go-build,id=bldr/root/.cache/go-build --mount=type=cache,target=/go/pkg,id=bldr/go/pkg ./hack/govulncheck.sh -exclude 'GO-2025-4020' ./...
100100

101101
# runs unit-tests with race detector
102102
FROM base AS unit-tests-race

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-29T13:07:19Z by kres fdbc9fc.
3+
# Generated on 2025-11-06T11:19:01Z by kres 4ba9b0c.
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.9
20+
PROTOBUF_GO_VERSION ?= 1.36.10
2121
GRPC_GO_VERSION ?= 1.5.1
22-
GRPC_GATEWAY_VERSION ?= 2.27.2
22+
GRPC_GATEWAY_VERSION ?= 2.27.3
2323
VTPROTOBUF_VERSION ?= 0.6.0
24-
GOIMPORTS_VERSION ?= 0.37.0
24+
GOIMPORTS_VERSION ?= 0.38.0
2525
GOMOCK_VERSION ?= 0.6.0
2626
DEEPCOPY_VERSION ?= v0.5.8
27-
GOLANGCILINT_VERSION ?= v2.4.0
27+
GOLANGCILINT_VERSION ?= v2.5.0
2828
GOFUMPT_VERSION ?= v0.9.1
29-
GO_VERSION ?= 1.25.1
29+
GO_VERSION ?= 1.25.3
3030
GO_BUILDFLAGS ?=
3131
GO_LDFLAGS ?=
3232
CGO_ENABLED ?= 0

cmd/bldr/cmd/update.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ var updateCmd = &cobra.Command{
3636
Long: `This command updates checksums of all sources that reference given variable
3737
in their URL.
3838
39-
Example:
39+
Example:
4040
4141
bldr update Pkgfile linux_version
4242
@@ -98,7 +98,7 @@ func diffUpdater(ctx context.Context) {
9898

9999
//nolint:gocognit
100100
func singleVariableUpdater(ctx context.Context, varsPath, varName string) {
101-
const phase1Repl = "XXXXXXXXXXXXX----YYYYYYYYYYYYYY"
101+
const phase1Repl = "XXXXXXXXXXXXX^^^^YYYYYYYYYYYYYY"
102102

103103
var (
104104
affectedSources []v1alpha2.Source

go.mod

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
11
module github.com/siderolabs/bldr
22

3-
go 1.25.0
3+
go 1.25.3
44

5-
replace github.com/anchore/syft => github.com/dsseng/syft v0.0.0-20250703101014-f39c35d156d9
5+
replace github.com/anchore/syft => github.com/dsseng/syft v1.26.2-0.20250703101014-f39c35d156d9
66

77
require (
88
github.com/Masterminds/sprig/v3 v3.3.0
9-
github.com/anchore/syft v1.28.0
9+
github.com/anchore/syft v1.37.0
1010
github.com/cheggaaa/pb/v3 v3.1.7
11-
github.com/containerd/platforms v1.0.0-rc.1
12-
github.com/emicklei/dot v1.9.1
11+
github.com/containerd/platforms v1.0.0-rc.2
12+
github.com/emicklei/dot v1.9.2
1313
github.com/hashicorp/go-multierror v1.1.1
14-
github.com/moby/buildkit v0.24.0
14+
github.com/moby/buildkit v0.25.2
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
19-
github.com/siderolabs/gen v0.8.5
19+
github.com/siderolabs/gen v0.8.6
2020
github.com/spf13/cobra v1.10.1
2121
github.com/stretchr/testify v1.11.1
22+
go.yaml.in/yaml/v4 v4.0.0-rc.2
2223
golang.org/x/sync v0.17.0
23-
gopkg.in/yaml.v3 v3.0.1
2424
)
2525

2626
require (
@@ -74,7 +74,7 @@ require (
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.3+incompatible // indirect
77+
github.com/docker/cli v28.4.0+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
@@ -192,5 +192,6 @@ require (
192192
google.golang.org/genproto/googleapis/api v0.0.0-20250707201910-8d1bb00bc6a7 // indirect
193193
google.golang.org/genproto/googleapis/rpc v0.0.0-20250707201910-8d1bb00bc6a7 // indirect
194194
google.golang.org/grpc v1.73.0 // indirect
195-
google.golang.org/protobuf v1.36.6 // indirect
195+
google.golang.org/protobuf v1.36.9 // indirect
196+
gopkg.in/yaml.v3 v3.0.1 // indirect
196197
)

go.sum

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -793,8 +793,8 @@ github.com/containerd/fifo v1.1.0 h1:4I2mbh5stb1u6ycIABlBw9zgtlK8viPI9QkQNRQEEmY
793793
github.com/containerd/fifo v1.1.0/go.mod h1:bmC4NWMbXlt2EZ0Hc7Fx7QzTFxgPID13eH0Qu+MAb2o=
794794
github.com/containerd/log v0.1.0 h1:TCJt7ioM2cr/tfR8GPbGf9/VRAX8D2B4PjzCpfX540I=
795795
github.com/containerd/log v0.1.0/go.mod h1:VRRf09a7mHDIRezVKTRCrOq78v577GXq3bSa3EhrzVo=
796-
github.com/containerd/platforms v1.0.0-rc.1 h1:83KIq4yy1erSRgOVHNk1HYdPvzdJ5CnsWaRoJX4C41E=
797-
github.com/containerd/platforms v1.0.0-rc.1/go.mod h1:J71L7B+aiM5SdIEqmd9wp6THLVRzJGXfNuWCZCllLA4=
796+
github.com/containerd/platforms v1.0.0-rc.2 h1:0SPgaNZPVWGEi4grZdV8VRYQn78y+nm6acgLGv/QzE4=
797+
github.com/containerd/platforms v1.0.0-rc.2/go.mod h1:J71L7B+aiM5SdIEqmd9wp6THLVRzJGXfNuWCZCllLA4=
798798
github.com/containerd/stargz-snapshotter v0.16.3 h1:zbQMm8dRuPHEOD4OqAYGajJJUwCeUzt4j7w9Iaw58u4=
799799
github.com/containerd/stargz-snapshotter/estargz v0.16.3 h1:7evrXtoh1mSbGj/pfRccTampEyKpjpOnS3CyiV1Ebr8=
800800
github.com/containerd/stargz-snapshotter/estargz v0.16.3/go.mod h1:uyr4BfYfOj3G9WBVE8cOlQmXAbPN9VEQpBBeJIuOipU=
@@ -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.3+incompatible h1:fp9ZHAr1WWPGdIWBM1b3zLtgCF+83gRdVMTJsUeiyAo=
820-
github.com/docker/cli v28.3.3+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
819+
github.com/docker/cli v28.4.0+incompatible h1:RBcf3Kjw2pMtwui5V0DIMdyeab8glEw5QY0UUU4C9kY=
820+
github.com/docker/cli v28.4.0+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.3.3+incompatible h1:Dypm25kh4rmk49v1eiVbsAtpAsYURjYkaKubwuBdxEI=
824-
github.com/docker/docker v28.3.3+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
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=
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=
@@ -834,11 +834,11 @@ github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3
834834
github.com/dsnet/compress v0.0.2-0.20230904184137-39efe44ab707 h1:2tV76y6Q9BB+NEBasnqvs7e49aEBFI8ejC89PSnWH+4=
835835
github.com/dsnet/compress v0.0.2-0.20230904184137-39efe44ab707/go.mod h1:qssHWj60/X5sZFNxpG4HBPDHVqxNm4DfnCKgrbZOT+s=
836836
github.com/dsnet/golib v0.0.0-20171103203638-1ea166775780/go.mod h1:Lj+Z9rebOhdfkVLjJ8T6VcRQv3SXugXy999NBtR9aFY=
837-
github.com/dsseng/syft v0.0.0-20250703101014-f39c35d156d9 h1:F2TgPiZHAa6Rr7OMBk//WEKlG0HZ2wGya6T37hsJ1k8=
838-
github.com/dsseng/syft v0.0.0-20250703101014-f39c35d156d9/go.mod h1:jGpfAy5lRvOUrOxWAfbbu9t3TK8VwJpAAJHz6HFQofw=
837+
github.com/dsseng/syft v1.26.2-0.20250703101014-f39c35d156d9 h1:oG9Q5NQkAJ5F+yHL7oNH1U1xH7KtZn96Th2Pg4CoyD8=
838+
github.com/dsseng/syft v1.26.2-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.1 h1:SBySmOPaQ6+fpmnqEaG1bCHj5hW65A0jJpcPpz+TG3w=
841-
github.com/emicklei/dot v1.9.1/go.mod h1:DeV7GvQtIw4h2u73RKBkkFdvVAz0D9fzeJrgPW6gy/s=
840+
github.com/emicklei/dot v1.9.2 h1:E/Wjz+BAH+JDhybEpISbo+QyDMNSiu/wqmIW9y922P8=
841+
github.com/emicklei/dot v1.9.2/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.24.0 h1:qYfTl7W1SIJzWDIDCcPT8FboHIZCYfi++wvySi3eyFE=
1219-
github.com/moby/buildkit v0.24.0/go.mod h1:4qovICAdR2H4C7+EGMRva5zgHW1gyhT4/flHI7F5F9k=
1218+
github.com/moby/buildkit v0.25.2 h1:mReLKDPv05cqk6o/u3ixq2/iTsWGHoUO5Zg3lojrQTk=
1219+
github.com/moby/buildkit v0.25.2/go.mod h1:phM8sdqnvgK2y1dPDnbwI6veUCXHOZ6KFSl6E164tkc=
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=
@@ -1340,8 +1340,8 @@ github.com/shibumi/go-pathspec v1.3.0 h1:QUyMZhFo0Md5B8zV8x2tesohbb5kfbpTi9rBnKh
13401340
github.com/shibumi/go-pathspec v1.3.0/go.mod h1:Xutfslp817l2I1cZvgcfeMQJG5QnU2lh5tVaaMCl3jE=
13411341
github.com/shopspring/decimal v1.4.0 h1:bxl37RwXBklmTi0C79JfXCEBD1cqqHt0bbgBAGFp81k=
13421342
github.com/shopspring/decimal v1.4.0/go.mod h1:gawqmDU56v4yIKSwfBSFip1HdCCXN8/+DMd9qYNcwME=
1343-
github.com/siderolabs/gen v0.8.5 h1:xlWXTynnGD/epaj7uplvKvmAkBH+Fp51bLnw1JC0xME=
1344-
github.com/siderolabs/gen v0.8.5/go.mod h1:CRrktDXQf3yDJI7xKv+cDYhBbKdfd/YE16OpgcHoT9E=
1343+
github.com/siderolabs/gen v0.8.6 h1:pE6shuqov3L+5rEcAUJ/kY6iJofimljQw5G95P8a5c4=
1344+
github.com/siderolabs/gen v0.8.6/go.mod h1:J9IbusbES2W6QWjtSHpDV9iPGZHc978h1+KJ4oQRspQ=
13451345
github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
13461346
github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
13471347
github.com/sirupsen/logrus v1.9.4-0.20230606125235-dd1b4c2e81af h1:Sp5TG9f7K39yfB+If0vjp97vuT74F72r8hfRpP8jLU0=
@@ -1485,6 +1485,8 @@ go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9i
14851485
go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
14861486
go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
14871487
go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo=
1488+
go.yaml.in/yaml/v4 v4.0.0-rc.2 h1:/FrI8D64VSr4HtGIlUtlFMGsm7H7pWTbj6vOLVZcA6s=
1489+
go.yaml.in/yaml/v4 v4.0.0-rc.2/go.mod h1:aZqd9kCMsGL7AuUv/m/PvWLdg5sjJsZ4oHDEnfPPfY0=
14881490
golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
14891491
golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
14901492
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
@@ -2190,8 +2192,8 @@ google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqw
21902192
google.golang.org/protobuf v1.29.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
21912193
google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
21922194
google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
2193-
google.golang.org/protobuf v1.36.6 h1:z1NpPI8ku2WgiWnf+t9wTPsn6eP1L7ksHUlkfLvd9xY=
2194-
google.golang.org/protobuf v1.36.6/go.mod h1:jduwjTPXsFjZGTmRluh+L6NjiWu7pchiJ2/5YcXBHnY=
2195+
google.golang.org/protobuf v1.36.9 h1:w2gp2mA27hUeUzj9Ex9FBjsBm40zfaDtEWow293U7Iw=
2196+
google.golang.org/protobuf v1.36.9/go.mod h1:fuxRtAxBytpl4zzqUh6/eyUujkJdNiuEkXntxiD/uRU=
21952197
gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
21962198
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
21972199
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=

internal/pkg/constants/build.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ const VarsYaml = "vars.yaml"
2525
// Pkgfile is the filename of 'Pkgfile'.
2626
const Pkgfile = "Pkgfile"
2727

28-
// Template extension.
28+
// TemplateExt extension.
2929
const TemplateExt = ".tmpl"
3030

3131
// StageXBusyboxImage is the image name for busybox from stageX.

internal/pkg/types/v1alpha1/types.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"fmt"
1010
"os"
1111

12-
"gopkg.in/yaml.v3"
12+
"go.yaml.in/yaml/v4"
1313
)
1414

1515
// Options are the options for the build.

0 commit comments

Comments
 (0)