mirror of
https://gitea.com/Lydanne/buildx.git
synced 2025-07-10 05:27:07 +08:00
vendor: update buildkit to v0.17.0-rc2
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
This commit is contained in:
28
vendor/github.com/moby/buildkit/util/apicaps/pb/caps.pb.go
generated
vendored
28
vendor/github.com/moby/buildkit/util/apicaps/pb/caps.pb.go
generated
vendored
@ -1,6 +1,6 @@
|
||||
// Code generated by protoc-gen-go. DO NOT EDIT.
|
||||
// versions:
|
||||
// protoc-gen-go v1.34.1
|
||||
// protoc-gen-go v1.35.1
|
||||
// protoc v3.11.4
|
||||
// source: github.com/moby/buildkit/util/apicaps/pb/caps.proto
|
||||
|
||||
@ -36,11 +36,9 @@ type APICap struct {
|
||||
|
||||
func (x *APICap) Reset() {
|
||||
*x = APICap{}
|
||||
if protoimpl.UnsafeEnabled {
|
||||
mi := &file_github_com_moby_buildkit_util_apicaps_pb_caps_proto_msgTypes[0]
|
||||
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
||||
ms.StoreMessageInfo(mi)
|
||||
}
|
||||
mi := &file_github_com_moby_buildkit_util_apicaps_pb_caps_proto_msgTypes[0]
|
||||
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
||||
ms.StoreMessageInfo(mi)
|
||||
}
|
||||
|
||||
func (x *APICap) String() string {
|
||||
@ -51,7 +49,7 @@ func (*APICap) ProtoMessage() {}
|
||||
|
||||
func (x *APICap) ProtoReflect() protoreflect.Message {
|
||||
mi := &file_github_com_moby_buildkit_util_apicaps_pb_caps_proto_msgTypes[0]
|
||||
if protoimpl.UnsafeEnabled && x != nil {
|
||||
if x != nil {
|
||||
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
||||
if ms.LoadMessageInfo() == nil {
|
||||
ms.StoreMessageInfo(mi)
|
||||
@ -150,7 +148,7 @@ func file_github_com_moby_buildkit_util_apicaps_pb_caps_proto_rawDescGZIP() []by
|
||||
}
|
||||
|
||||
var file_github_com_moby_buildkit_util_apicaps_pb_caps_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
|
||||
var file_github_com_moby_buildkit_util_apicaps_pb_caps_proto_goTypes = []interface{}{
|
||||
var file_github_com_moby_buildkit_util_apicaps_pb_caps_proto_goTypes = []any{
|
||||
(*APICap)(nil), // 0: moby.buildkit.v1.apicaps.APICap
|
||||
}
|
||||
var file_github_com_moby_buildkit_util_apicaps_pb_caps_proto_depIdxs = []int32{
|
||||
@ -166,20 +164,6 @@ func file_github_com_moby_buildkit_util_apicaps_pb_caps_proto_init() {
|
||||
if File_github_com_moby_buildkit_util_apicaps_pb_caps_proto != nil {
|
||||
return
|
||||
}
|
||||
if !protoimpl.UnsafeEnabled {
|
||||
file_github_com_moby_buildkit_util_apicaps_pb_caps_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
|
||||
switch v := v.(*APICap); i {
|
||||
case 0:
|
||||
return &v.state
|
||||
case 1:
|
||||
return &v.sizeCache
|
||||
case 2:
|
||||
return &v.unknownFields
|
||||
default:
|
||||
return nil
|
||||
}
|
||||
}
|
||||
}
|
||||
type x struct{}
|
||||
out := protoimpl.TypeBuilder{
|
||||
File: protoimpl.DescBuilder{
|
||||
|
4
vendor/github.com/moby/buildkit/util/disk/disk_openbsd.go
generated
vendored
4
vendor/github.com/moby/buildkit/util/disk/disk_openbsd.go
generated
vendored
@ -5,12 +5,14 @@ package disk
|
||||
|
||||
import (
|
||||
"syscall"
|
||||
|
||||
"github.com/pkg/errors"
|
||||
)
|
||||
|
||||
func GetDiskStat(root string) (DiskStat, error) {
|
||||
var st syscall.Statfs_t
|
||||
if err := syscall.Statfs(root, &st); err != nil {
|
||||
return DiskStat{}, err
|
||||
return DiskStat{}, errors.Wrapf(err, "could not stat fs at %s", root)
|
||||
}
|
||||
|
||||
return DiskStat{
|
||||
|
4
vendor/github.com/moby/buildkit/util/disk/disk_unix.go
generated
vendored
4
vendor/github.com/moby/buildkit/util/disk/disk_unix.go
generated
vendored
@ -5,12 +5,14 @@ package disk
|
||||
|
||||
import (
|
||||
"syscall"
|
||||
|
||||
"github.com/pkg/errors"
|
||||
)
|
||||
|
||||
func GetDiskStat(root string) (DiskStat, error) {
|
||||
var st syscall.Statfs_t
|
||||
if err := syscall.Statfs(root, &st); err != nil {
|
||||
return DiskStat{}, err
|
||||
return DiskStat{}, errors.Wrapf(err, "could not stat fs at %s", root)
|
||||
}
|
||||
|
||||
return DiskStat{
|
||||
|
5
vendor/github.com/moby/buildkit/util/disk/disk_windows.go
generated
vendored
5
vendor/github.com/moby/buildkit/util/disk/disk_windows.go
generated
vendored
@ -4,13 +4,14 @@
|
||||
package disk
|
||||
|
||||
import (
|
||||
"github.com/pkg/errors"
|
||||
"golang.org/x/sys/windows"
|
||||
)
|
||||
|
||||
func GetDiskStat(root string) (DiskStat, error) {
|
||||
rootUTF16, err := windows.UTF16FromString(root)
|
||||
if err != nil {
|
||||
return DiskStat{}, err
|
||||
return DiskStat{}, errors.Wrapf(err, "could not encode %s", root)
|
||||
}
|
||||
var (
|
||||
totalBytes uint64
|
||||
@ -22,7 +23,7 @@ func GetDiskStat(root string) (DiskStat, error) {
|
||||
&freeAvailableBytes,
|
||||
&totalBytes,
|
||||
&totalFreeBytes); err != nil {
|
||||
return DiskStat{}, err
|
||||
return DiskStat{}, errors.Wrapf(err, "could not stat fs at %s", root)
|
||||
}
|
||||
|
||||
return DiskStat{
|
||||
|
24
vendor/github.com/moby/buildkit/util/gitutil/git_cli.go
generated
vendored
24
vendor/github.com/moby/buildkit/util/gitutil/git_cli.go
generated
vendored
@ -218,6 +218,14 @@ func (cli *GitCLI) Run(ctx context.Context, args ...string) (_ []byte, err error
|
||||
continue
|
||||
}
|
||||
}
|
||||
if strings.Contains(errbuf.String(), "not our ref") || strings.Contains(errbuf.String(), "unadvertised object") {
|
||||
// server-side error: https://github.com/git/git/blob/34b6ce9b30747131b6e781ff718a45328aa887d0/upload-pack.c#L811-L812
|
||||
// client-side error: https://github.com/git/git/blob/34b6ce9b30747131b6e781ff718a45328aa887d0/fetch-pack.c#L2250-L2253
|
||||
if newArgs := argsNoCommitRefspec(args); len(args) > len(newArgs) {
|
||||
args = newArgs
|
||||
continue
|
||||
}
|
||||
}
|
||||
|
||||
return buf.Bytes(), errors.Wrapf(err, "git stderr:\n%s", errbuf.String())
|
||||
}
|
||||
@ -244,3 +252,19 @@ func argsNoDepth(args []string) []string {
|
||||
}
|
||||
return out
|
||||
}
|
||||
|
||||
func argsNoCommitRefspec(args []string) []string {
|
||||
if len(args) <= 2 {
|
||||
return args
|
||||
}
|
||||
if args[0] != "fetch" {
|
||||
return args
|
||||
}
|
||||
|
||||
// assume the refspec is the last arg
|
||||
if IsCommitSHA(args[len(args)-1]) {
|
||||
return args[:len(args)-1]
|
||||
}
|
||||
|
||||
return args
|
||||
}
|
||||
|
19
vendor/github.com/moby/buildkit/util/gitutil/git_commit.go
generated
vendored
Normal file
19
vendor/github.com/moby/buildkit/util/gitutil/git_commit.go
generated
vendored
Normal file
@ -0,0 +1,19 @@
|
||||
package gitutil
|
||||
|
||||
func IsCommitSHA(str string) bool {
|
||||
if len(str) != 40 {
|
||||
return false
|
||||
}
|
||||
|
||||
for _, ch := range str {
|
||||
if ch >= '0' && ch <= '9' {
|
||||
continue
|
||||
}
|
||||
if ch >= 'a' && ch <= 'f' {
|
||||
continue
|
||||
}
|
||||
return false
|
||||
}
|
||||
|
||||
return true
|
||||
}
|
50
vendor/github.com/moby/buildkit/util/stack/stack.pb.go
generated
vendored
50
vendor/github.com/moby/buildkit/util/stack/stack.pb.go
generated
vendored
@ -1,6 +1,6 @@
|
||||
// Code generated by protoc-gen-go. DO NOT EDIT.
|
||||
// versions:
|
||||
// protoc-gen-go v1.34.1
|
||||
// protoc-gen-go v1.35.1
|
||||
// protoc v3.11.4
|
||||
// source: github.com/moby/buildkit/util/stack/stack.proto
|
||||
|
||||
@ -34,11 +34,9 @@ type Stack struct {
|
||||
|
||||
func (x *Stack) Reset() {
|
||||
*x = Stack{}
|
||||
if protoimpl.UnsafeEnabled {
|
||||
mi := &file_github_com_moby_buildkit_util_stack_stack_proto_msgTypes[0]
|
||||
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
||||
ms.StoreMessageInfo(mi)
|
||||
}
|
||||
mi := &file_github_com_moby_buildkit_util_stack_stack_proto_msgTypes[0]
|
||||
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
||||
ms.StoreMessageInfo(mi)
|
||||
}
|
||||
|
||||
func (x *Stack) String() string {
|
||||
@ -49,7 +47,7 @@ func (*Stack) ProtoMessage() {}
|
||||
|
||||
func (x *Stack) ProtoReflect() protoreflect.Message {
|
||||
mi := &file_github_com_moby_buildkit_util_stack_stack_proto_msgTypes[0]
|
||||
if protoimpl.UnsafeEnabled && x != nil {
|
||||
if x != nil {
|
||||
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
||||
if ms.LoadMessageInfo() == nil {
|
||||
ms.StoreMessageInfo(mi)
|
||||
@ -111,11 +109,9 @@ type Frame struct {
|
||||
|
||||
func (x *Frame) Reset() {
|
||||
*x = Frame{}
|
||||
if protoimpl.UnsafeEnabled {
|
||||
mi := &file_github_com_moby_buildkit_util_stack_stack_proto_msgTypes[1]
|
||||
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
||||
ms.StoreMessageInfo(mi)
|
||||
}
|
||||
mi := &file_github_com_moby_buildkit_util_stack_stack_proto_msgTypes[1]
|
||||
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
||||
ms.StoreMessageInfo(mi)
|
||||
}
|
||||
|
||||
func (x *Frame) String() string {
|
||||
@ -126,7 +122,7 @@ func (*Frame) ProtoMessage() {}
|
||||
|
||||
func (x *Frame) ProtoReflect() protoreflect.Message {
|
||||
mi := &file_github_com_moby_buildkit_util_stack_stack_proto_msgTypes[1]
|
||||
if protoimpl.UnsafeEnabled && x != nil {
|
||||
if x != nil {
|
||||
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
||||
if ms.LoadMessageInfo() == nil {
|
||||
ms.StoreMessageInfo(mi)
|
||||
@ -200,7 +196,7 @@ func file_github_com_moby_buildkit_util_stack_stack_proto_rawDescGZIP() []byte {
|
||||
}
|
||||
|
||||
var file_github_com_moby_buildkit_util_stack_stack_proto_msgTypes = make([]protoimpl.MessageInfo, 2)
|
||||
var file_github_com_moby_buildkit_util_stack_stack_proto_goTypes = []interface{}{
|
||||
var file_github_com_moby_buildkit_util_stack_stack_proto_goTypes = []any{
|
||||
(*Stack)(nil), // 0: stack.Stack
|
||||
(*Frame)(nil), // 1: stack.Frame
|
||||
}
|
||||
@ -218,32 +214,6 @@ func file_github_com_moby_buildkit_util_stack_stack_proto_init() {
|
||||
if File_github_com_moby_buildkit_util_stack_stack_proto != nil {
|
||||
return
|
||||
}
|
||||
if !protoimpl.UnsafeEnabled {
|
||||
file_github_com_moby_buildkit_util_stack_stack_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
|
||||
switch v := v.(*Stack); i {
|
||||
case 0:
|
||||
return &v.state
|
||||
case 1:
|
||||
return &v.sizeCache
|
||||
case 2:
|
||||
return &v.unknownFields
|
||||
default:
|
||||
return nil
|
||||
}
|
||||
}
|
||||
file_github_com_moby_buildkit_util_stack_stack_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
|
||||
switch v := v.(*Frame); i {
|
||||
case 0:
|
||||
return &v.state
|
||||
case 1:
|
||||
return &v.sizeCache
|
||||
case 2:
|
||||
return &v.unknownFields
|
||||
default:
|
||||
return nil
|
||||
}
|
||||
}
|
||||
}
|
||||
type x struct{}
|
||||
out := protoimpl.TypeBuilder{
|
||||
File: protoimpl.DescBuilder{
|
||||
|
Reference in New Issue
Block a user