Skip to content

hack/vendor: add check for vendored archive/tar#41212

Merged
thaJeztah merged 1 commit intomoby:masterfrom
thaJeztah:archive_vendor
May 27, 2021
Merged

hack/vendor: add check for vendored archive/tar#41212
thaJeztah merged 1 commit intomoby:masterfrom
thaJeztah:archive_vendor

Conversation

@thaJeztah
Copy link
Member

@thaJeztah thaJeztah commented Jul 15, 2020 •
edited
Loading

relates to #40672
relates to #40353

@thaJeztah thaJeztah requested a review from tianon as a code owner July 15, 2020 11:50
@thaJeztah
Copy link
Member Author

thaJeztah commented Jul 15, 2020

@tiborvass @tianon @AkihiroSuda PTAL

tianon
tianon reviewed Jul 15, 2020
View reviewed changes
thaJeztah
thaJeztah commented May 20, 2021
View reviewed changes
Copy link
Member Author

@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.

@tianon updated with your suggestions, ptal 👍

hack/vendor.sh Outdated
Copy link
Member Author

@thaJeztah thaJeztah May 20, 2021

Choose a reason for hiding this comment

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

Added this to allow re-vendoring just archive/tar

hack/vendor.sh Outdated
Copy link
Member Author

@thaJeztah thaJeztah May 20, 2021

Choose a reason for hiding this comment

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

Same here

@thaJeztah thaJeztah added this to the 21.xx milestone May 20, 2021
@thaJeztah thaJeztah mentioned this pull request May 20, 2021
Merged
20 tasks
@thaJeztah
Copy link
Member Author

thaJeztah commented May 20, 2021

It's not failing on this one, because a full vendor check wasn't done, but (from #40353) looks like it needs patch to be installed now;

[2021-05-20T10:25:56.173Z] + docker run --rm -t --privileged -v /home/ubuntu/workspace/moby_PR-40353/.git:/go/src/github.com/docker/docker/.git --name docker-pr57 -e DOCKER_EXPERIMENTAL -e DOCKER_GITCOMMIT=a94673cae6a72ee7dbb2625a8f6934b54fd14fa8 -e DOCKER_GRAPHDRIVER -e TEST_FORCE_VALIDATE -e VALIDATE_REPO=https://github.com/moby/moby.git -e VALIDATE_BRANCH=master docker:a94673cae6a72ee7dbb2625a8f6934b54fd14fa8 hack/validate/vendor
[2021-05-20T10:25:57.099Z] update vendored copy of archive/tar
[2021-05-20T10:25:57.099Z] downloading: https://golang.org/dl/go1.16.4.src.tar.gz
[2021-05-20T10:25:58.025Z] ./hack/vendor.sh: line 23: patch: command not found
script returned exit code 127

@thaJeztah
hack/vendor: add check for vendored archive/tar
31b2c3b 
Also allow re-vendoring using `./hack/vendor.sh archive/tar`

Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah
Copy link
Member Author

thaJeztah commented May 20, 2021

Triggered CI with validate_force enabled

Screenshot 2021-05-20 at 18 58 46

@thaJeztah thaJeztah merged commit 454abc5 into moby:master May 27, 2021
@thaJeztah thaJeztah deleted the archive_vendor branch May 27, 2021 22:10
@thaJeztah thaJeztah mentioned this pull request Jul 15, 2021
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@tianon tianon tianon approved these changes

@AkihiroSuda AkihiroSuda AkihiroSuda approved these changes

Assignees

No one assigned

Labels

area/testing process/cherry-picked status/4-merge

Projects

None yet

Milestone

23.0.0

Development

Successfully merging this pull request may close these issues.

3 participants

@thaJeztah @tianon @AkihiroSuda