Skip to content

Commit 64bc21a

Browse files
authored
Merge pull request #6479 from tonistiigi/v0.27-picks
[v0.27] cherry-picks
2 parents b2fc80e + 6f380e6 commit 64bc21a

File tree

5 files changed

+67
-9
lines changed

5 files changed

+67
-9
lines changed

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ require (
7878
github.com/stretchr/testify v1.11.1
7979
github.com/tonistiigi/dchapes-mode v0.0.0-20250318174251-73d941a28323
8080
github.com/tonistiigi/fsutil v0.0.0-20251211185533-a2aa163d723f
81-
github.com/tonistiigi/go-actions-cache v0.0.0-20250626083717-378c5ed1ddd9
81+
github.com/tonistiigi/go-actions-cache v0.0.0-20260120203934-54bc28c26fd2
8282
github.com/tonistiigi/go-archvariant v1.0.0
8383
github.com/tonistiigi/go-csvvalue v0.0.0-20240814133006-030d3b2625d0
8484
github.com/tonistiigi/units v0.0.0-20180711220420-6950e57a87ea
@@ -228,7 +228,7 @@ require (
228228
go.yaml.in/yaml/v3 v3.0.4 // indirect
229229
golang.org/x/term v0.38.0 // indirect
230230
golang.org/x/text v0.32.0 // indirect
231-
google.golang.org/genproto/googleapis/api v0.0.0-20250929231259-57b25ae835d4 // indirect
231+
google.golang.org/genproto/googleapis/api v0.0.0-20251103181224-f26f9409b101 // indirect
232232
google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.5.1 // indirect
233233
gopkg.in/yaml.v3 v3.0.1 // indirect
234234
kernel.org/pub/linux/libs/security/libcap/psx v1.2.77 // indirect

go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -606,8 +606,8 @@ github.com/tonistiigi/dchapes-mode v0.0.0-20250318174251-73d941a28323 h1:r0p7fK5
606606
github.com/tonistiigi/dchapes-mode v0.0.0-20250318174251-73d941a28323/go.mod h1:3Iuxbr0P7D3zUzBMAZB+ois3h/et0shEz0qApgHYGpY=
607607
github.com/tonistiigi/fsutil v0.0.0-20251211185533-a2aa163d723f h1:Z4NEQ86qFl1mHuCu9gwcE+EYCwDKfXAYXZbdIXyxmEA=
608608
github.com/tonistiigi/fsutil v0.0.0-20251211185533-a2aa163d723f/go.mod h1:BKdcez7BiVtBvIcef90ZPc6ebqIWr4JWD7+EvLm6J98=
609-
github.com/tonistiigi/go-actions-cache v0.0.0-20250626083717-378c5ed1ddd9 h1:GWuTlpuUQBaK6u0R3HwE+eWaQ2aXwHgo8CaXgqtDQZU=
610-
github.com/tonistiigi/go-actions-cache v0.0.0-20250626083717-378c5ed1ddd9/go.mod h1:cD0SB2270BYw6HYKriFn4H6NRLhGj6ytf48YTpsm8LY=
609+
github.com/tonistiigi/go-actions-cache v0.0.0-20260120203934-54bc28c26fd2 h1:5p6hffZeB25G4rhBc3HU6x1aIlyDELfib+/Omq+ZfQA=
610+
github.com/tonistiigi/go-actions-cache v0.0.0-20260120203934-54bc28c26fd2/go.mod h1:cD0SB2270BYw6HYKriFn4H6NRLhGj6ytf48YTpsm8LY=
611611
github.com/tonistiigi/go-archvariant v1.0.0 h1:5LC1eDWiBNflnTF1prCiX09yfNHIxDC/aukdhCdTyb0=
612612
github.com/tonistiigi/go-archvariant v1.0.0/go.mod h1:TxFmO5VS6vMq2kvs3ht04iPXtu2rUT/erOnGFYfk5Ho=
613613
github.com/tonistiigi/go-csvvalue v0.0.0-20240814133006-030d3b2625d0 h1:2f304B10LaZdB8kkVEaoXvAMVan2tl9AiK4G0odjQtE=
@@ -778,8 +778,8 @@ google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98
778778
google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
779779
google.golang.org/genproto v0.0.0-20250922171735-9219d122eba9 h1:LvZVVaPE0JSqL+ZWb6ErZfnEOKIqqFWUJE2D0fObSmc=
780780
google.golang.org/genproto v0.0.0-20250922171735-9219d122eba9/go.mod h1:QFOrLhdAe2PsTp3vQY4quuLKTi9j3XG3r6JPPaw7MSc=
781-
google.golang.org/genproto/googleapis/api v0.0.0-20250929231259-57b25ae835d4 h1:8XJ4pajGwOlasW+L13MnEGA8W4115jJySQtVfS2/IBU=
782-
google.golang.org/genproto/googleapis/api v0.0.0-20250929231259-57b25ae835d4/go.mod h1:NnuHhy+bxcg30o7FnVAZbXsPHUDQ9qKWAQKCD7VxFtk=
781+
google.golang.org/genproto/googleapis/api v0.0.0-20251103181224-f26f9409b101 h1:vk5TfqZHNn0obhPIYeS+cxIFKFQgser/M2jnI+9c6MM=
782+
google.golang.org/genproto/googleapis/api v0.0.0-20251103181224-f26f9409b101/go.mod h1:E17fc4PDhkr22dE3RgnH2hEubUaky6ZwW4VhANxyspg=
783783
google.golang.org/genproto/googleapis/rpc v0.0.0-20251103181224-f26f9409b101 h1:tRPGkdGHuewF4UisLzzHHr1spKw92qLM98nIzxbC0wY=
784784
google.golang.org/genproto/googleapis/rpc v0.0.0-20251103181224-f26f9409b101/go.mod h1:7i2o+ce6H/6BluujYR+kqX3GKH+dChPTQU19wjRPiGk=
785785
google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=

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

Lines changed: 56 additions & 1 deletion
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: 3 additions & 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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1038,7 +1038,7 @@ github.com/tonistiigi/dchapes-mode
10381038
github.com/tonistiigi/fsutil
10391039
github.com/tonistiigi/fsutil/copy
10401040
github.com/tonistiigi/fsutil/types
1041-
# github.com/tonistiigi/go-actions-cache v0.0.0-20250626083717-378c5ed1ddd9
1041+
# github.com/tonistiigi/go-actions-cache v0.0.0-20260120203934-54bc28c26fd2
10421042
## explicit; go 1.23.0
10431043
github.com/tonistiigi/go-actions-cache
10441044
# github.com/tonistiigi/go-archvariant v1.0.0
@@ -1286,7 +1286,7 @@ golang.org/x/text/unicode/norm
12861286
# golang.org/x/time v0.14.0
12871287
## explicit; go 1.24.0
12881288
golang.org/x/time/rate
1289-
# google.golang.org/genproto/googleapis/api v0.0.0-20250929231259-57b25ae835d4
1289+
# google.golang.org/genproto/googleapis/api v0.0.0-20251103181224-f26f9409b101
12901290
## explicit; go 1.24.0
12911291
google.golang.org/genproto/googleapis/api
12921292
google.golang.org/genproto/googleapis/api/annotations

0 commit comments

Comments
 (0)