vendor: github.com/urfave/cli v1.22.9 and fix "verify-vendor" script#6997
Merged
kzys merged 2 commits intocontainerd:mainfrom May 27, 2022
Merged
vendor: github.com/urfave/cli v1.22.9 and fix "verify-vendor" script#6997kzys merged 2 commits intocontainerd:mainfrom
kzys merged 2 commits intocontainerd:mainfrom
Conversation
Member
Author
|
I'll work on a follow-up to this one to see if we can make use of the new |
Member
Author
|
Hmm... what's this error? |
Before this patch, if the go.mod did not contain a replace rule, jq would fail
(Cannot iterate over null), and Bash would produce an error when trying to add
an empty `$key` to `map_requires`:
make verify-vendor
+ verify-vendor
jq: error (at <stdin>:581): Cannot iterate over null (null)
/go/src/github.com/containerd/containerd//script/verify-go-modules.sh: line 44: map_replaces_1[$key]: bad array subscript
make: *** [Makefile:435: verify-vendor] Error 1
Signed-off-by: Sebastiaan van Stijn <[email protected]>
thaJeztah
changed the title
The regression in v1.22.2 has been resolved, so we can drop the replace rule and use the latest v1.22.x version. full diff: urfave/cli@v1.22.1...v1.22.9 Signed-off-by: Sebastiaan van Stijn <[email protected]>
Member
Author
|
Pushed a commit to fix the vendor check |
Member
Author
|
Failures should probably not be related (as #6998 went green); let me close/reopen to trigger CI |
Member
Author
|
Hmm.. that didn't seem to trigger the cirrus jobs (which were the ones failing); perhaps it's just slow to report, so let's see |
estesp
approved these changes
May 27, 2022
Member
estesp
left a comment
estesp
left a comment
There was a problem hiding this comment.
LGTM 🎉 (nice to see the replace rules disappearing!)
kzys
approved these changes
May 27, 2022
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
fix verify-vendor if go.mod does not contain replace rules
Before this patch, if the go.mod did not contain a replace rule, jq would fail
(Cannot iterate over null), and Bash would produce an error when trying to add
an empty
$keytomap_requires:vendor: github.com/urfave/cli v1.22.9
The regression in v1.22.2 has been resolved, so we can drop the
replace rule and use the latest v1.22.x version.
full diff: urfave/cli@v1.22.1...v1.22.9