vendor: Bump hive to a050d77562a1ae37fc2358e047edef10623fc6f7 #379
Conversation
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
This is the recommended import URI [1]. And survey's internal imports use the gopkg.in form, so we're already vendoring it; this change will let us drop the redundant github.com copies. The explicit package name is not strictly necessary, but I like to set it when the final segment of the import URL does not match the package name declared within the imported package. [1]: https://github.com/AlecAivazis/survey/tree/v1.6.2#versioning
Generated with: $ glide remove github.com/AlecAivazis/survey $ glide get --strip-vendor gopkg.in/AlecAivazis/survey [INFO]Preparing to install 1 package. [INFO]Attempting to get package gopkg.in/AlecAivazis/survey.v1 [INFO]--> Gathering release information for gopkg.in/AlecAivazis/survey.v1 [INFO]The package gopkg.in/AlecAivazis/survey.v1 appears to have Semantic Version releases (http://semver.org). [INFO]The latest release is v1.6.2. You are currently not using a release. Would you like [INFO]to use this release? Yes (Y) or No (N) y [INFO]The package gopkg.in/AlecAivazis/survey.v1 appears to use semantic versions (http://semver.org). [INFO]Would you like to track the latest minor or patch releases (major.minor.patch)? [INFO]The choices are: [INFO] - Tracking minor version releases would use '>= 1.6.2, < 2.0.0' ('^1.6.2') [INFO] - Tracking patch version releases would use '>= 1.6.2, < 1.7.0' ('~1.6.2') [INFO] - Skip using ranges [INFO]For more information on Glide versions and ranges see https://glide.sh/docs/versions [INFO]Minor (M), Patch (P), or Skip Ranges (S)? m [INFO]--> Adding gopkg.in/AlecAivazis/survey.v1 to your configuration with the version ^1.6.2 ... $ glide-vc --use-lock-file --no-tests --only-code $ git checkout HEAD -- vendor/github.com/shurcooL/httpfs using: $ glide --version glide version 0.13.2-dev $ (cd $GOPATH/src/github.com/Masterminds/glide && git describe) v0.13.1-7-g3e13fd1 $ (cd $GOPATH/src/github.com/sgotti/glide-vc && git describe) v0.1.0-2-g6ddf6ee The httpfs works around our busted vfsutil vendor, see a8cce08 (vendor: Add shurcooL/httpfs/vfsutil, 2018-09-26, openshift#340). The formatting change unwinds ff9e547 (*: format all yaml files, 2018-09-27, openshift#342), but it doesn't seem to be worth fighting Glide on this front.
Temporarily make the script a no-op while we work out whether we want
to keep this. It's currently complaining about the YAML output from
Glide in the previous commit [1]:
./glide.yaml
1:1 warning missing document start "---" (document-start)
3:1 error wrong indentation: expected 2 but found 0 (indentation)
5:1 error wrong indentation: expected 2 but found 0 (indentation)
38:1 error wrong indentation: expected 2 but found 0 (indentation)
Dropping the script entirely would break CI [2]. Alex is ok dropping
yamllint entirely, but I'm half-interested in keeping it around in
case we decide to move any static YAML assets
(e.g. pkg/asset/manifests/content/tectonic/rbac/role-user.go) over
into data/data.
[1]: https://storage.googleapis.com/origin-ci-test/pr-logs/pull/openshift_installer/370/pull-ci-openshift-installer-yaml-lint/636/build-log.txt
[2]: https://github.com/openshift/release/blob/d7ea5b36da63140fbb99c293aadde3bb279a24f9/ci-operator/jobs/openshift/installer/openshift-installer-master-presubmits.yaml#L354
openshift-ci-robot
added
approved
I updated the import path to keep up with openshift/hive@ae569e39 (Add make verify target, 2018-09-24, openshift/hive#13). Then I bumped vendor/ with: $ rm -rf ~/.glide/cache/info/https-github.com-openshift-hive.json ~/.glide/cache/src/https-github.com-openshift-hive/ $ glide remove github.com/openshift/hive $ glide get --strip-vendor github.com/openshift/hive $ glide-vc --use-lock-file --no-tests --only-code $ git checkout HEAD -- vendor/github.com/shurcooL/httpfs using: $ glide --version glide version 0.13.2-dev $ (cd $GOPATH/src/github.com/Masterminds/glide && git describe) v0.13.1-7-g3e13fd1 $ (cd $GOPATH/src/github.com/sgotti/glide-vc && git describe) v0.1.0-2-g6ddf6ee I don't know why I needed to clear my cache, but without that line the remaining commands didn't bump vendor/github.com/openshift/hive to its current master. Bumping to openshift/hive@a050d775 (Merge pull request openshift/hive#28 from wking/tag-20-load-balancers-per-request, 2018-09-28) gives us more reliable load-balancer deletion.
openshift-ci-robot
added
size/XXL
Member
Author
Contributor
|
/lgtm |
Contributor
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: abhinavdahiya, wking The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
This was referenced Sep 29, 2018
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 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.
I updated the import path to keep up with openshift/hive@ae569e39 (openshift/hive#13). Then I bumped vendor/ with:
using:
I don't know why I needed to clear my cache, but without that line the remaining commands didn't bump vendor/github.com/openshift/hive to its current master.
Bumping to openshift/hive@a050d775 (openshift/hive#28) gives us more reliable load-balancer deletion.
/assign @abhinavdahiya