From c54aec5c854b5492c1a0bbe2c3384ea580e973c8 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Mon, 7 Dec 2020 12:50:36 +0100 Subject: [PATCH] vendor: BuildKit v0.8.0 full diff: https://github.com/moby/buildkit/compare/v0.8.0-rc2...v0.8.0 note that this is currently a few commits "behind" the version used in docker, but changes since v0.8.0 do not affect the code that's vendored in the CLI, so prefering to use a tagged version. Signed-off-by: Sebastiaan van Stijn --- vendor.conf | 2 +- vendor/github.com/moby/buildkit/README.md | 3 ++- .../moby/buildkit/solver/errdefs/context.go | 13 +++++++++++++ 3 files changed, 16 insertions(+), 2 deletions(-) create mode 100644 vendor/github.com/moby/buildkit/solver/errdefs/context.go diff --git a/vendor.conf b/vendor.conf index b64853eabf..02f0fb2cb7 100755 --- a/vendor.conf +++ b/vendor.conf @@ -48,7 +48,7 @@ github.com/Microsoft/go-winio 5b44b70ab3ab4d291a7c1d28afe7 github.com/Microsoft/hcsshim 5bc557dd210ff2caf615e6e22d398123de77fc11 # v0.8.9 github.com/miekg/pkcs11 210dc1e16747c5ba98a03bcbcf728c38086ea357 # v1.0.3 github.com/mitchellh/mapstructure d16e9488127408e67948eb43b6d3fbb9f222da10 # v1.3.2 -github.com/moby/buildkit fcb87e6b8ccf3631a65799cc56caa76f9117816e # v0.8.0-rc2 +github.com/moby/buildkit 73fe4736135645a342abc7b587bba0994cccf0f9 # v0.8.0 github.com/moby/sys 1bc8673b57550ddf85262eb0fed0aac651a37dab # symlink/v0.1.0 (latest tag, either mount/vXXX, mountinfo/vXXX or symlink/vXXX) github.com/moby/term bea5bbe245bf407372d477f1361d2ff042d2f556 github.com/modern-go/concurrent bacd9c7ef1dd9b15be4a9909b8ac7a4e313eec94 # 1.0.3 diff --git a/vendor/github.com/moby/buildkit/README.md b/vendor/github.com/moby/buildkit/README.md index 0af9e2e126..4532dd7cde 100644 --- a/vendor/github.com/moby/buildkit/README.md +++ b/vendor/github.com/moby/buildkit/README.md @@ -3,8 +3,9 @@ # BuildKit [![GoDoc](https://godoc.org/github.com/moby/buildkit?status.svg)](https://godoc.org/github.com/moby/buildkit/client/llb) -[![Build Status](https://travis-ci.org/moby/buildkit.svg?branch=master)](https://travis-ci.org/moby/buildkit) +[![Build Status](https://travis-ci.com/moby/buildkit.svg?branch=master)](https://travis-ci.com/moby/buildkit) [![Go Report Card](https://goreportcard.com/badge/github.com/moby/buildkit)](https://goreportcard.com/report/github.com/moby/buildkit) +[![codecov](https://codecov.io/gh/moby/buildkit/branch/master/graph/badge.svg)](https://codecov.io/gh/moby/buildkit) BuildKit is a toolkit for converting source code to build artifacts in an efficient, expressive and repeatable manner. diff --git a/vendor/github.com/moby/buildkit/solver/errdefs/context.go b/vendor/github.com/moby/buildkit/solver/errdefs/context.go new file mode 100644 index 0000000000..ea6bdfbf09 --- /dev/null +++ b/vendor/github.com/moby/buildkit/solver/errdefs/context.go @@ -0,0 +1,13 @@ +package errdefs + +import ( + "context" + "errors" + + "github.com/moby/buildkit/util/grpcerrors" + "google.golang.org/grpc/codes" +) + +func IsCanceled(err error) bool { + return errors.Is(err, context.Canceled) || grpcerrors.Code(err) == codes.Canceled +}