Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[20.10] vendor: github.com/moby/buildkit eeb7b65ab7d651770a5ec52a06ea7c96eb97a249 (v0.8 branch) #44339

Merged
merged 1 commit into from Oct 21, 2022

Conversation

crazy-max
Copy link
Member

@crazy-max crazy-max commented Oct 20, 2022

Copy link
Member

@thaJeztah thaJeztah left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@thaJeztah
Copy link
Member

@crazy-max looks like some additional packages have to be pulled into vendor;


[2022-10-20T22:24:32.383Z] vendor/github.com/moby/buildkit/util/progress/logs/logs.go:13:2: cannot find package "github.com/armon/circbuf" in any of:
[2022-10-20T22:24:32.383Z] 	/go/src/github.com/docker/docker/vendor/github.com/armon/circbuf (vendor tree)
[2022-10-20T22:24:32.383Z] 	/usr/local/go/src/github.com/armon/circbuf (from $GOROOT)
[2022-10-20T22:24:32.383Z] 	/go/src/github.com/armon/circbuf (from $GOPATH)

@crazy-max
Copy link
Member Author

Ahhh indeed I was still in the go modules world my bad.

@thaJeztah
Copy link
Member

I think usually it adds them with vndr as well, unless it's a new dependency, but yeah.. 😂

@crazy-max
Copy link
Member Author

I think usually it adds them with vndr as well, unless it's a new dependency, but yeah.. 😂

Yes was a new one

@thaJeztah
Copy link
Member

Failures will be fixed once #44340 is merged

@thaJeztah
Copy link
Member

Almost green now; wondering if it would be newline or whitespace changes. Let me try to run a vendor on this branch;

 The result of vndr differs
 
  M vendor/github.com/armon/circbuf/LICENSE
 
 Please vendor your package with github.com/LK4D4/vndr.

@thaJeztah
Copy link
Member

ah!

git diff
diff --git a/vendor/github.com/armon/circbuf/LICENSE b/vendor/github.com/armon/circbuf/LICENSE
old mode 100644
new mode 100755

…7c96eb97a249 (v0.8 branch)

Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Copy link
Member

@thaJeztah thaJeztah left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

all green now, thanks!

LGTM

@thaJeztah thaJeztah merged commit 82f583c into moby:20.10 Oct 21, 2022
@crazy-max crazy-max deleted the 20.10_update_buildkit branch October 21, 2022 22:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants