Skip to content

Commit 121ecd5

Browse files
authored
Merge pull request moby#5761 from jsternberg/v0.20.0-picks
[v0.20] cherry-picks for v0.20.0
2 parents 6cad2f9 + c7153d1 commit 121ecd5

File tree

6 files changed

+19
-8
lines changed

6 files changed

+19
-8
lines changed

cache/remotecache/gha/gha.go

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ import (
2222
"github.com/moby/buildkit/util/compression"
2323
"github.com/moby/buildkit/util/progress"
2424
"github.com/moby/buildkit/util/tracing"
25+
bkversion "github.com/moby/buildkit/version"
2526
"github.com/moby/buildkit/worker"
2627
digest "github.com/opencontainers/go-digest"
2728
ocispecs "github.com/opencontainers/image-spec/specs-go/v1"
@@ -140,8 +141,9 @@ type exporter struct {
140141
func NewExporter(c *Config) (remotecache.Exporter, error) {
141142
cc := v1.NewCacheChains()
142143
cache, err := actionscache.New(c.Token, c.URL, c.Version > 1, actionscache.Opt{
143-
Client: tracing.DefaultClient,
144-
Timeout: c.Timeout,
144+
Client: tracing.DefaultClient,
145+
Timeout: c.Timeout,
146+
UserAgent: bkversion.UserAgent(),
145147
})
146148
if err != nil {
147149
return nil, err
@@ -315,8 +317,9 @@ type importer struct {
315317

316318
func NewImporter(c *Config) (remotecache.Importer, error) {
317319
cache, err := actionscache.New(c.Token, c.URL, c.Version > 1, actionscache.Opt{
318-
Client: tracing.DefaultClient,
319-
Timeout: c.Timeout,
320+
Client: tracing.DefaultClient,
321+
Timeout: c.Timeout,
322+
UserAgent: bkversion.UserAgent(),
320323
})
321324
if err != nil {
322325
return nil, err

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ require (
7373
github.com/stretchr/testify v1.10.0
7474
github.com/tonistiigi/dchapes-mode v0.0.0-20241001053921-ca0759fec205
7575
github.com/tonistiigi/fsutil v0.0.0-20250113203817-b14e27f4135a
76-
github.com/tonistiigi/go-actions-cache v0.0.0-20250211194249-bd99cf5bbc65
76+
github.com/tonistiigi/go-actions-cache v0.0.0-20250219102945-1a5174abd055
7777
github.com/tonistiigi/go-archvariant v1.0.0
7878
github.com/tonistiigi/go-csvvalue v0.0.0-20240710180619-ddb21b71c0b4
7979
github.com/tonistiigi/units v0.0.0-20180711220420-6950e57a87ea

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -401,8 +401,8 @@ github.com/tonistiigi/dchapes-mode v0.0.0-20241001053921-ca0759fec205 h1:eUk79E1
401401
github.com/tonistiigi/dchapes-mode v0.0.0-20241001053921-ca0759fec205/go.mod h1:3Iuxbr0P7D3zUzBMAZB+ois3h/et0shEz0qApgHYGpY=
402402
github.com/tonistiigi/fsutil v0.0.0-20250113203817-b14e27f4135a h1:EfGw4G0x/8qXWgtcZ6KVaPS+wpWOQMaypczzP8ojkMY=
403403
github.com/tonistiigi/fsutil v0.0.0-20250113203817-b14e27f4135a/go.mod h1:Dl/9oEjK7IqnjAm21Okx/XIxUCFJzvh+XdVHUlBwXTw=
404-
github.com/tonistiigi/go-actions-cache v0.0.0-20250211194249-bd99cf5bbc65 h1:57xLt2zJ6in5Au6plQUKm1gfasse4j3h9lrvoor2xPs=
405-
github.com/tonistiigi/go-actions-cache v0.0.0-20250211194249-bd99cf5bbc65/go.mod h1:h0oRlVs3NoFIHysRQ4rU1+RG4QmU0M2JVSwTYrB4igk=
404+
github.com/tonistiigi/go-actions-cache v0.0.0-20250219102945-1a5174abd055 h1:ocuqZe/ImPTYgDocnHTDOTBachfQ9m0JxvP4uGeDtBE=
405+
github.com/tonistiigi/go-actions-cache v0.0.0-20250219102945-1a5174abd055/go.mod h1:h0oRlVs3NoFIHysRQ4rU1+RG4QmU0M2JVSwTYrB4igk=
406406
github.com/tonistiigi/go-archvariant v1.0.0 h1:5LC1eDWiBNflnTF1prCiX09yfNHIxDC/aukdhCdTyb0=
407407
github.com/tonistiigi/go-archvariant v1.0.0/go.mod h1:TxFmO5VS6vMq2kvs3ht04iPXtu2rUT/erOnGFYfk5Ho=
408408
github.com/tonistiigi/go-csvvalue v0.0.0-20240710180619-ddb21b71c0b4 h1:7I5c2Ig/5FgqkYOh/N87NzoyI9U15qUPXhDD8uCupv8=

vendor/github.com/tonistiigi/go-actions-cache/cache.go

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

vendor/github.com/tonistiigi/go-actions-cache/cache_v2.go

Lines changed: 1 addition & 0 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
@@ -809,7 +809,7 @@ github.com/tonistiigi/dchapes-mode
809809
github.com/tonistiigi/fsutil
810810
github.com/tonistiigi/fsutil/copy
811811
github.com/tonistiigi/fsutil/types
812-
# github.com/tonistiigi/go-actions-cache v0.0.0-20250211194249-bd99cf5bbc65
812+
# github.com/tonistiigi/go-actions-cache v0.0.0-20250219102945-1a5174abd055
813813
## explicit; go 1.22
814814
github.com/tonistiigi/go-actions-cache
815815
# github.com/tonistiigi/go-archvariant v1.0.0

0 commit comments

Comments
 (0)