Skip to content

vendor: update buildkit to v0.18.0-rc1#48923

Merged
thaJeztah merged 2 commits intomoby:masterfrom
tonistiigi:buildkit-v0.18.0-rc1
Nov 22, 2024
Merged

vendor: update buildkit to v0.18.0-rc1#48923
thaJeztah merged 2 commits intomoby:masterfrom
tonistiigi:buildkit-v0.18.0-rc1

Conversation

@tonistiigi
Copy link
Member

@tonistiigi tonistiigi commented Nov 22, 2024 •
edited by thaJeztah
Loading

@tonistiigi tonistiigi marked this pull request as draft November 22, 2024 06:15
@tonistiigi tonistiigi marked this pull request as ready for review November 22, 2024 06:18
@crazy-max
Copy link
Member

crazy-max commented Nov 22, 2024 •
edited
Loading

@tonistiigi As discussed offline about https://github.com/moby/moby/actions/runs/11967527151/job/33364978457#step:13:43433

 === FAIL: client TestIntegration/TestDiffAsParentMultipleLayers/worker=dockerd-containerd (2.09s)
    client_test.go:7857: checkAllReleasable: skipping check for exported tars in non-containerd test
    client_test.go:7855: 
        	Error Trace:	/src/client/client_test.go:7855
        	            				/src/client/mergediff_test.go:1454
        	            				/src/client/client_test.go:7721
        	            				/src/client/mergediff_test.go:1281
        	            				/src/util/testutil/integration/run.go:211
        	Error:      	Not equal: 
        	            	expected: 0
        	            	actual  : 5
        	Test:       	TestIntegration/TestDiffAsParentMultipleLayers/worker=dockerd-containerd

This relates to https://github.com/moby/buildkit/pull/5516/files#diff-57cdc3e29d0ef725a50897a4fbd1c4f76353429fa66d3a785dcbc17dcd7b6f31R7855

Which needs a change on buildkit repo to check we are using containerd snap. I'm looking at it.

@crazy-max crazy-max mentioned this pull request Nov 22, 2024
Merged
@thaJeztah thaJeztah mentioned this pull request Nov 22, 2024
Merged
@crazy-max
Copy link
Member

crazy-max commented Nov 22, 2024

Tested with #48924 and looks good.

@thaJeztah thaJeztah mentioned this pull request Nov 22, 2024
Merged
@thaJeztah thaJeztah force-pushed the buildkit-v0.18.0-rc1 branch from 7cdb36d to 48b237f Compare November 22, 2024 13:01
@thaJeztah
Copy link
Member

thaJeztah commented Nov 22, 2024

Rebased and added a commit to update the vendor with the fix from @crazy-max included;

vendor: github.com/moby/buildkit 94d0f6ed85e5 (master / v0.18.0-rc.2)

full diff: moby/buildkit@v0.18.0-rc1...94d0f6e

@thaJeztah thaJeztah added this to the 28.0.0 milestone Nov 22, 2024
thaJeztah
thaJeztah approved these changes Nov 22, 2024
View reviewed changes
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 thaJeztah merged commit d377619 into moby:master Nov 22, 2024
@thompson-shaun thompson-shaun mentioned this pull request Nov 22, 2024
Closed
@thaJeztah thaJeztah mentioned this pull request Nov 25, 2024
Merged
5 tasks
@thaJeztah thaJeztah mentioned this pull request Jan 14, 2025
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@thaJeztah thaJeztah thaJeztah approved these changes

@crazy-max crazy-max crazy-max approved these changes

Assignees

No one assigned

Labels

area/builder/buildkit Build area/builder Build impact/changelog process/cherry-picked status/2-code-review

Projects

None yet

Milestone

28.0.0

Development

Successfully merging this pull request may close these issues.

3 participants

@tonistiigi @crazy-max @thaJeztah