Skip to content

Commit 9c5897f

Browse files
authored
Merge pull request #3443 from jsternberg/v0.29-picks
[0.29] cherry-picks for v0.29.0
2 parents b4b698c + caf3cbd commit 9c5897f

File tree

4 files changed

+27
-8
lines changed

4 files changed

+27
-8
lines changed

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ require (
2929
github.com/hashicorp/hcl/v2 v2.24.0
3030
github.com/in-toto/in-toto-golang v0.9.0
3131
github.com/mitchellh/hashstructure/v2 v2.0.2
32-
github.com/moby/buildkit v0.25.0-rc1
32+
github.com/moby/buildkit v0.25.0
3333
github.com/moby/go-archive v0.1.0
3434
github.com/moby/sys/atomicwriter v0.1.0
3535
github.com/moby/sys/mountinfo v0.7.2

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -255,8 +255,8 @@ github.com/mitchellh/go-wordwrap v1.0.1/go.mod h1:R62XHJLzvMFRBbcrT7m7WgmE1eOyTS
255255
github.com/mitchellh/hashstructure/v2 v2.0.2 h1:vGKWl0YJqUNxE8d+h8f6NJLcCJrgbhC4NcD46KavDd4=
256256
github.com/mitchellh/hashstructure/v2 v2.0.2/go.mod h1:MG3aRVU/N29oo/V/IhBX8GR/zz4kQkprJgF2EVszyDE=
257257
github.com/mitchellh/mapstructure v0.0.0-20150613213606-2caf8efc9366/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
258-
github.com/moby/buildkit v0.25.0-rc1 h1:BX93yFRfF1LzD12wCOhjncbpL3RvkPa1+fF7xmsdr28=
259-
github.com/moby/buildkit v0.25.0-rc1/go.mod h1:phM8sdqnvgK2y1dPDnbwI6veUCXHOZ6KFSl6E164tkc=
258+
github.com/moby/buildkit v0.25.0 h1:cRgh74ymzyHxS5a/lsYT4OCyVU8iC3UgkwasIEUi0og=
259+
github.com/moby/buildkit v0.25.0/go.mod h1:phM8sdqnvgK2y1dPDnbwI6veUCXHOZ6KFSl6E164tkc=
260260
github.com/moby/docker-image-spec v1.3.1 h1:jMKff3w6PgbfSa69GfNg+zN/XLhfXJGnEx3Nl2EsFP0=
261261
github.com/moby/docker-image-spec v1.3.1/go.mod h1:eKmb5VW8vQEh/BAr2yvVNvuiJuY6UIocYsFu/DxxRpo=
262262
github.com/moby/go-archive v0.1.0 h1:Kk/5rdW/g+H8NHdJW2gsXyZ7UnzvJNOy6VKJqueWdcQ=

vendor/github.com/moby/buildkit/util/grpcerrors/grpcerrors.go

Lines changed: 23 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/modules.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -448,7 +448,7 @@ github.com/mitchellh/go-wordwrap
448448
# github.com/mitchellh/hashstructure/v2 v2.0.2
449449
## explicit; go 1.14
450450
github.com/mitchellh/hashstructure/v2
451-
# github.com/moby/buildkit v0.25.0-rc1
451+
# github.com/moby/buildkit v0.25.0
452452
## explicit; go 1.24.0
453453
github.com/moby/buildkit/api/services/control
454454
github.com/moby/buildkit/api/types

0 commit comments

Comments
 (0)