Skip to content

Commit 6b5bbe7

Browse files
authored
Merge branch 'wolfi-dev:main' into main
2 parents 026142e + a7aff9f commit 6b5bbe7

File tree

10 files changed

+105
-86
lines changed

10 files changed

+105
-86
lines changed

.github/workflows/build-goreleaser.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
runs-on: ubuntu-latest
1919

2020
steps:
21-
- uses: step-security/harden-runner@002fdce3c6a235733a90a27c80493a3241e56863 # v2.12.1
21+
- uses: step-security/harden-runner@6c439dc8bdf85cadbbce9ed30d1c7b959517bc49 # v2.12.2
2222
with:
2323
egress-policy: audit
2424

.github/workflows/build.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818

1919
steps:
2020
- name: Harden Runner
21-
uses: step-security/harden-runner@002fdce3c6a235733a90a27c80493a3241e56863 # v2.12.1
21+
uses: step-security/harden-runner@6c439dc8bdf85cadbbce9ed30d1c7b959517bc49 # v2.12.2
2222
with:
2323
egress-policy: audit
2424

@@ -31,7 +31,7 @@ jobs:
3131
go-version-file: 'go.mod'
3232
check-latest: true
3333

34-
- uses: chainguard-dev/actions/goimports@939ece6bc39459fd24dde56e63ca93adf840031e # v1.2.1
34+
- uses: chainguard-dev/actions/goimports@16e2fd6603a1c6a1fbc880fdbb922b2e8e2be3e7 # v1.4.3
3535
- run: make wolfictl
3636
- run: make test
3737

@@ -44,7 +44,7 @@ jobs:
4444

4545
steps:
4646
- name: Harden Runner
47-
uses: step-security/harden-runner@002fdce3c6a235733a90a27c80493a3241e56863 # v2.12.1
47+
uses: step-security/harden-runner@6c439dc8bdf85cadbbce9ed30d1c7b959517bc49 # v2.12.2
4848
with:
4949
egress-policy: audit
5050

@@ -92,7 +92,7 @@ jobs:
9292

9393
steps:
9494
- name: Harden Runner
95-
uses: step-security/harden-runner@002fdce3c6a235733a90a27c80493a3241e56863 # v2.12.1
95+
uses: step-security/harden-runner@6c439dc8bdf85cadbbce9ed30d1c7b959517bc49 # v2.12.2
9696
with:
9797
egress-policy: audit
9898

.github/workflows/golangci-lint.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
runs-on: ubuntu-latest
1717
steps:
1818
- name: Harden Runner
19-
uses: step-security/harden-runner@002fdce3c6a235733a90a27c80493a3241e56863 # v2.12.1
19+
uses: step-security/harden-runner@6c439dc8bdf85cadbbce9ed30d1c7b959517bc49 # v2.12.2
2020
with:
2121
egress-policy: audit
2222

.github/workflows/release.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838

3939
steps:
4040
- name: Harden Runner
41-
uses: step-security/harden-runner@002fdce3c6a235733a90a27c80493a3241e56863 # v2.12.1
41+
uses: step-security/harden-runner@6c439dc8bdf85cadbbce9ed30d1c7b959517bc49 # v2.12.2
4242
with:
4343
egress-policy: audit
4444

@@ -53,7 +53,7 @@ jobs:
5353
fetch-depth: 0 # fetch all history for all tags and branches
5454
token: ${{ steps.octo-sts.outputs.token }}
5555

56-
- uses: sigstore/cosign-installer@fb28c2b6339dcd94da6e4cbcbc5e888961f6f8c3 # v3.9.0
56+
- uses: sigstore/cosign-installer@398d4b0eeef1380460a10c8013a76f728fb906ac # v3.9.1
5757

5858
- uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
5959
with:
@@ -73,7 +73,7 @@ jobs:
7373
fi
7474
7575
- name: Bump and push Git tag
76-
uses: chainguard-dev/actions/git-tag@939ece6bc39459fd24dde56e63ca93adf840031e # v1.2.1
76+
uses: chainguard-dev/actions/git-tag@16e2fd6603a1c6a1fbc880fdbb922b2e8e2be3e7 # v1.4.3
7777
if: steps.check.outputs.bump == 'yes'
7878
with:
7979
token: ${{ steps.octo-sts.outputs.token }}

.pre-commit-hooks.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
- id: wolfictl-lint
2+
name: Format files properly using wolfictl lint
3+
description: Helps to prevent any linting check failures in CI
4+
entry: wolfictl lint
5+
language: golang
6+
stages: [pre-commit, manual]
7+
types: ["text"]
8+

go.mod

Lines changed: 23 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@ replace github.com/mholt/archiver/v3 => github.com/anchore/archiver/v3 v3.5.2
1111
replace modernc.org/sqlite v1.33.0 => modernc.org/sqlite v1.32.0
1212

1313
require (
14-
chainguard.dev/apko v0.27.9
15-
chainguard.dev/melange v0.26.12
14+
chainguard.dev/apko v0.28.0
15+
chainguard.dev/melange v0.28.0
1616
cloud.google.com/go/storage v1.55.0
1717
github.com/adrg/xdg v0.5.3
18-
github.com/anchore/grype v0.92.2
18+
github.com/anchore/grype v0.94.0
1919
github.com/anchore/stereoscope v0.1.5
2020
github.com/anchore/syft v1.27.1
2121
github.com/chainguard-dev/clog v1.7.0
22-
github.com/chainguard-dev/yam v0.2.20
22+
github.com/chainguard-dev/yam v0.2.22
2323
github.com/charmbracelet/bubbles v0.21.0
2424
github.com/charmbracelet/bubbletea v1.3.5
2525
github.com/charmbracelet/lipgloss v1.1.1-0.20250319133953-166f707985bc
@@ -38,7 +38,7 @@ require (
3838
github.com/google/go-github/v58 v58.0.0
3939
github.com/google/osv-scanner v1.9.2
4040
github.com/google/uuid v1.6.0
41-
github.com/hashicorp/go-retryablehttp v0.7.7
41+
github.com/hashicorp/go-retryablehttp v0.7.8
4242
github.com/hashicorp/go-version v1.7.0
4343
github.com/knqyf263/go-apk-version v0.0.0-20200609155635-041fdbb8563f
4444
github.com/lucasb-eyer/go-colorful v1.2.0
@@ -47,7 +47,7 @@ require (
4747
github.com/package-url/packageurl-go v0.1.3
4848
github.com/samber/lo v1.51.0
4949
github.com/santhosh-tekuri/jsonschema/v5 v5.3.1
50-
github.com/savioxavier/termlink v1.4.2
50+
github.com/savioxavier/termlink v1.4.3
5151
github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966
5252
github.com/spf13/cobra v1.9.1
5353
github.com/spf13/pflag v1.0.6
@@ -67,7 +67,7 @@ require (
6767

6868
require (
6969
github.com/anchore/go-logger v0.0.0-20250318195838-07ae343dd722
70-
github.com/chainguard-dev/advisory-schema v0.37.10
70+
github.com/chainguard-dev/advisory-schema v0.37.11
7171
github.com/spf13/afero v1.14.0
7272
)
7373

@@ -76,7 +76,7 @@ require (
7676
chainguard.dev/go-grpc-kit v0.17.10 // indirect
7777
chainguard.dev/sdk v0.1.32 // indirect
7878
cloud.google.com/go v0.121.1 // indirect
79-
cloud.google.com/go/auth v0.16.1 // indirect
79+
cloud.google.com/go/auth v0.16.2 // indirect
8080
cloud.google.com/go/auth/oauth2adapt v0.2.8 // indirect
8181
cloud.google.com/go/compute/metadata v0.7.0 // indirect
8282
cloud.google.com/go/iam v1.5.2 // indirect
@@ -159,7 +159,7 @@ require (
159159
github.com/distribution/reference v0.6.0 // indirect
160160
github.com/docker/cli v28.2.2+incompatible // indirect
161161
github.com/docker/distribution v2.8.3+incompatible // indirect
162-
github.com/docker/docker v28.1.1+incompatible // indirect
162+
github.com/docker/docker v28.2.2+incompatible // indirect
163163
github.com/docker/docker-credential-helpers v0.9.3 // indirect
164164
github.com/docker/go-connections v0.5.0 // indirect
165165
github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c // indirect
@@ -180,15 +180,15 @@ require (
180180
github.com/go-jose/go-jose/v3 v3.0.4 // indirect
181181
github.com/go-jose/go-jose/v4 v4.1.0 // indirect
182182
github.com/go-logfmt/logfmt v0.6.0 // indirect
183-
github.com/go-logr/logr v1.4.2 // indirect
183+
github.com/go-logr/logr v1.4.3 // indirect
184184
github.com/go-logr/stdr v1.2.2 // indirect
185185
github.com/go-restruct/restruct v1.2.0-alpha // indirect
186186
github.com/go-viper/mapstructure/v2 v2.2.1 // indirect
187187
github.com/gogo/protobuf v1.3.2 // indirect
188188
github.com/gohugoio/hashstructure v0.5.0 // indirect
189189
github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
190190
github.com/golang/snappy v0.0.4 // indirect
191-
github.com/google/go-containerregistry v0.20.5 // indirect
191+
github.com/google/go-containerregistry v0.20.6 // indirect
192192
github.com/google/go-licenses/v2 v2.0.0-alpha.1 // indirect
193193
github.com/google/go-querystring v1.1.0 // indirect
194194
github.com/google/licensecheck v0.3.1 // indirect
@@ -213,6 +213,7 @@ require (
213213
github.com/huandu/xstrings v1.5.0 // indirect
214214
github.com/iancoleman/strcase v0.3.0 // indirect
215215
github.com/ijt/goparsify v0.0.0-20221203142333-3a5276334b8d // indirect
216+
github.com/in-toto/attestation v1.1.2 // indirect
216217
github.com/inconshreveable/mousetrap v1.1.0 // indirect
217218
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
218219
github.com/jinzhu/copier v0.4.0 // indirect
@@ -319,32 +320,32 @@ require (
319320
go.opencensus.io v0.24.0 // indirect
320321
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
321322
go.opentelemetry.io/contrib/detectors/gcp v1.36.0 // indirect
322-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.60.0 // indirect
323-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0 // indirect
324-
go.opentelemetry.io/otel v1.36.0 // indirect
323+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.61.0 // indirect
324+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0 // indirect
325+
go.opentelemetry.io/otel v1.37.0 // indirect
325326
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.36.0 // indirect
326-
go.opentelemetry.io/otel/metric v1.36.0 // indirect
327+
go.opentelemetry.io/otel/metric v1.37.0 // indirect
327328
go.opentelemetry.io/otel/sdk v1.36.0 // indirect
328329
go.opentelemetry.io/otel/sdk/metric v1.36.0 // indirect
329-
go.opentelemetry.io/otel/trace v1.36.0 // indirect
330-
go.step.sm/crypto v0.61.0 // indirect
330+
go.opentelemetry.io/otel/trace v1.37.0 // indirect
331+
go.step.sm/crypto v0.67.0 // indirect
331332
go.uber.org/multierr v1.11.0 // indirect
332333
go4.org v0.0.0-20230225012048-214862532bf5 // indirect
333334
golang.org/x/crypto v0.39.0 // indirect
334335
golang.org/x/mod v0.25.0 // indirect
335336
golang.org/x/net v0.41.0 // indirect
336337
golang.org/x/sys v0.33.0 // indirect
337-
golang.org/x/tools v0.33.0 // indirect
338+
golang.org/x/tools v0.34.0 // indirect
338339
golang.org/x/xerrors v0.0.0-20240716161551-93cc26a95ae9 // indirect
339-
google.golang.org/api v0.235.0 // indirect
340+
google.golang.org/api v0.239.0 // indirect
340341
google.golang.org/genproto v0.0.0-20250505200425-f936aa4a68b2 // indirect
341342
google.golang.org/genproto/googleapis/api v0.0.0-20250512202823-5a2f75b736a9 // indirect
342-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250512202823-5a2f75b736a9 // indirect
343-
google.golang.org/grpc v1.72.1 // indirect
343+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250603155806-513f23925822 // indirect
344+
google.golang.org/grpc v1.73.0 // indirect
344345
google.golang.org/protobuf v1.36.6 // indirect
345346
gopkg.in/ini.v1 v1.67.0 // indirect
346347
gopkg.in/warnings.v0 v0.1.2 // indirect
347-
gorm.io/gorm v1.26.1 // indirect
348+
gorm.io/gorm v1.30.0 // indirect
348349
k8s.io/apimachinery v0.32.3 // indirect
349350
k8s.io/klog/v2 v2.130.1 // indirect
350351
modernc.org/libc v1.65.10 // indirect

0 commit comments

Comments
 (0)