Skip to content

fix vendor of github.com/containerd/containerd#48826

Merged
thaJeztah merged 1 commit intomoby:masterfrom
thaJeztah:fix_vendor
Nov 6, 2024
Merged

fix vendor of github.com/containerd/containerd#48826
thaJeztah merged 1 commit intomoby:masterfrom
thaJeztah:fix_vendor

Conversation

@thaJeztah
Copy link
Member

@thaJeztah thaJeztah commented Nov 6, 2024

relates to;

The github.com/containerd/containerd/remotes/docker/config package was vendored incorrectly due to 5f39567 (update to containerd v1.7.23) being merged from an outdated branch that missed the changes from 8b4cb6f that brought in the dependency on the config package.

- A picture of a cute animal (not mandatory but encouraged)

@thaJeztah
fix vendor of github.com/containerd/containerd
9fc2b45 
The github.com/containerd/containerd/remotes/docker/config package
was vendored incorrectly due to 5f39567
(update to containerd v1.7.23) being merged from an outdated branch that
missed the changes from 8b4cb6f that
brought in the dependency on the config package.

Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah thaJeztah added this to the 28.0.0 milestone Nov 6, 2024
@thaJeztah thaJeztah self-assigned this Nov 6, 2024
@thaJeztah thaJeztah mentioned this pull request Nov 6, 2024
Merged
6 tasks
@thaJeztah thaJeztah requested a review from vvoland November 6, 2024 09:37
@thaJeztah
Copy link
Member Author

thaJeztah commented Nov 6, 2024

Interesting failure; race condition? Or would this be something similar to

=== Failed
=== FAIL: amd64.integration.container TestDiff (0.29s)
    diff_test.go:28: assertion failed: 
        --- expected
        +++ items
          []container.FilesystemChange(
        - 	{{Kind: s"A", Path: "/foo"}, {Kind: s"A", Path: "/foo/bar"}},
        + 	nil,
          )

@vvoland
Copy link
Contributor

vvoland commented Nov 6, 2024

I think it's a race condition - the test doesn't wait for the write to finish, so there's a chance that diff will finish faster.

@thaJeztah thaJeztah merged commit 110ab71 into moby:master Nov 6, 2024
@thaJeztah thaJeztah deleted the fix_vendor branch November 6, 2024 11:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@vvoland vvoland vvoland approved these changes

Assignees

@thaJeztah thaJeztah

Labels

area/dependencies area/runtime Runtime status/2-code-review

Projects

None yet

Milestone

28.0.0

Development

Successfully merging this pull request may close these issues.

2 participants

@thaJeztah @vvoland