Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

vendor: github.com/urfave/cli v1.22.9 and fix "verify-vendor" script #6997

Merged
merged 2 commits into from May 27, 2022
Merged

vendor: github.com/urfave/cli v1.22.9 and fix "verify-vendor" script #6997

merged 2 commits into from May 27, 2022

Commits on May 27, 2022

  1. 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 `$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 <github@gone.nl>
    @thaJeztah
    thaJeztah committed May 27, 2022
    Configuration menu
    Copy the full SHA
    a3a2d14 View commit details
    Browse the repository at this point in the history

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

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
    @thaJeztah
    thaJeztah committed May 27, 2022
    Configuration menu
    Copy the full SHA
    5bb47fb View commit details
    Browse the repository at this point in the history