Skip to content

Re-run vndr to fix master#40037

Merged
tiborvass merged 1 commit intomoby:masterfrom
thaJeztah:fix_vendoring
Oct 3, 2019
Merged

Re-run vndr to fix master#40037
tiborvass merged 1 commit intomoby:masterfrom
thaJeztah:fix_vendoring

Conversation

@thaJeztah
Copy link
Member

relates to #39966 (comment), #40032 (comment), #39713 (comment)

Pull requests started failing because vendoring didn't match;

The result of vndr differs

D vendor/golang.org/x/sync/singleflight/singleflight.go

Please vendor your package with github.com/LK4D4/vndr.

Pull requests started failing because vendoring didn't match;

```
The result of vndr differs

D vendor/golang.org/x/sync/singleflight/singleflight.go

Please vendor your package with github.com/LK4D4/vndr.
```

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

@cpuguy83 cpuguy83 left a comment

Choose a reason for hiding this comment

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

LGTM assuming CI is happy.

Do we know what happened?

@thaJeztah
Copy link
Member Author

No, I just found out that the problem was on master (see #40032 (comment)), I initially thought it was something weird with vndr

Likely a PR got merged out of order, or perhaps got merged on "red"

I'd like to find the PR though (in case it's one that we have to backport, so that we can cherry-pick them together)

@thaJeztah
Copy link
Member Author

I think this is the one; 3c54825 #39983

@thaJeztah
Copy link
Member Author

Ah! I understand why; this is from that PR:

[2019-10-02T20:48:17.877Z] + docker run --rm -t --privileged -v /home/ubuntu/workspace/moby_PR-39983/.git:/go/src/github.com/docker/docker/.git --name docker-pr4 -e DOCKER_EXPERIMENTAL -e DOCKER_GITCOMMIT=6ca3ec88ae9e1435abbed665ec598c00058659da -e DOCKER_GRAPHDRIVER docker:6ca3ec88ae9e1435abbed665ec598c00058659da hack/validate/vendor
[2019-10-02T20:48:18.810Z] No vendor changes in diff.

The vendor check only runs if vendor.conf is modified, but in this case the import was removed, therefore also affecting what has to be vendored

@thaJeztah
Copy link
Member Author

The vendor check only runs if vendor.conf is modified, but in this case the import was removed, therefore also affecting what has to be vendored

perhaps we should have a check if imports are added/removed (but that might be overhead); this likely is a bit of a corner case (last import of a package removed), so perhaps we should just take it for granted

@thaJeztah
Copy link
Member Author

Vendor check passed now:

Screenshot 2019-10-03 at 22 45 54

@tiborvass tiborvass merged commit c5c6b23 into moby:master Oct 3, 2019
@thaJeztah thaJeztah deleted the fix_vendoring branch October 3, 2019 21:09
@thaJeztah thaJeztah added this to the 20.03.0 milestone Apr 2, 2020
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.

5 participants