Fix (make vendor) #2291
Merged
Fix (make vendor) #2291
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Daniel J Walsh <[email protected]>
(export a=b command args) does not run (command args) with a=b, it sets $a to b, and marks variables $a $command $args as exported, i.e. (command args) is not run. So, before containers#2287 we were not actually running (go mod tidy), and now we are not running (go mod vendor). Fix that. Signed-off-by: Miloslav Trmač <[email protected]>
We switched the order because (go mod tidy) seemed not to work before, but the reason why it didn't work was only tangentially the ordering, and now that all commands do work, modifying the set of modules makes more sense before updating the vendor directory. Signed-off-by: Miloslav Trmač <[email protected]>
... now that its (go mod tidy) works. Signed-off-by: Miloslav Trmač <[email protected]>
... now that its (go mod vendor) works again. Signed-off-by: Miloslav Trmač <[email protected]> Signed-off-by: Daniel J Walsh <[email protected]>
|
Attempting to replace #2290 |
|
bors r+ |
Build succeeded
|
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What type of PR is this?
/kind bug
What this PR does / why we need it:
(export a=b command args) does not run (command args) with a=b, it sets $a to b, and marks variables $a $command $args as exported, i.e. (command args) is not run.
So, before #2287 we were not actually running (go mod tidy), and now we are not running (go mod vendor).
Fix that, and re-vendor.
Notably, vendored c/image and several other dependencies currently don’t correspond to go.mod.
How to verify it
Manually run (go mod …) and compare that with the results of running (make vendor)
Which issue(s) this PR fixes:
None
Special notes for your reviewer:
Does this PR introduce a user-facing change?
None