vendor: regenerate glide config for glide 0.12.3 #11218
Merged
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
|
Can we pin grpc-gateway for now to override the implicit version preference
from etcd?
…On Thu, Nov 24, 2016 at 12:41 AM Tamir Duberstein ***@***.***> wrote:
Assigned #11218 <#11218> to
@dt <https://github.com/dt>.
—
You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub
<#11218 (comment)>, or mute
the thread
<https://github.com/notifications/unsubscribe-auth/AAA8_0QVr20c9O-JNnOJlffgifQzwF4cks5rBSN0gaJpZM4K7S-O>
.
|
|
We can, but I would prefer we did that only after we had an accepted upstream bug or fix in glide. |
Performed with: ``` rm glide.yaml && glide init && cat GLOCKFILE | cut -f2 -d' ' | grep -F vendor | sed -e s,./vendor/,, | xargs glide get --non-interactive ``` Manually pins risky packages: - github.com/cockroachdb/c-jemalloc - github.com/cockroachdb/c-rocksdb - google.golang.org/grpc & github.com/gogo/protobuf Manually pins broken updates: - githu.com/docker/docker This reveals serious problems with the dependency update flow under glide. `glide update` completely removes the vendor directory, which means that the `.git` directory and all non-source content (README.md) are lost. The workflow needed to achieve a reasonable result is thus: ``` mv vendor/.git vendorgit && \ glide up && \ mv vendorgit vendor/.git && \ git -C vendor checkout README.md ``` This script is checked in as `scripts/glide-up.sh`. Running `git clean -dxn` in `vendor` produces: ``` Would remove github.com/cockroachdb/c-snappy/internal/testdata/ Would remove github.com/docker/distribution/contrib/docker-integration/malevolent-certs/ca.pem Would remove github.com/docker/distribution/contrib/docker-integration/nginx/ssl/ Would remove github.com/docker/distribution/contrib/docker-integration/tokenserver-oauth/certs/ca.pem Would remove github.com/docker/distribution/contrib/docker-integration/tokenserver/certs/ca.pem Would remove github.com/lightstep/lightstep-tracer-go/lightstep-tracer-common/ ``` `github.com/cockroachdb/c-snappy` and `github.com/docker/distribution` report ignored files because the repositories track files which are ostensibly ignored by various `.gitignore`s. This PR picks up cockroachdb/c-snappy#10 which fixes this for that package. However, `github.com/lightstep/lightstep-tracer-go` reporting `github.com/lightstep/lightstep-tracer-go/lightstep-tracer-common` as ignored revealed a serious problem: this directory is a submodule, and in our vendor checkout, it is empty. This suggests that `glide` did not check out the submodule, despite that being the behaviour of `go get` since https://golang.org/cl/9815. `glide update` is also terribly slow, clocking in around 1m30s. Finally, the move to glide of course breaks `glock-diff-parser`, which means the list of upstream changes must again be compiled manually. The changes are: - github.com/tebeka/go2xunit: - tests ending in os.Exit() are now parsed: tebeka/go2xunit#42 Note that glide also "updated" `github.com/grpc-ecosystem/grpc-gateway` to an older version, losing an earlier fix (grpc-ecosystem/grpc-gateway#256). My best guess is that one of our dependencies uses this earlier version, likely `github.com/coreos/etcd`. There seems to be no way to avoid this behaviour.
dt
approved these changes
Nov 24, 2016
| - package: github.com/cockroachdb/pq | ||
| - package: github.com/cockroachdb/stress | ||
| - package: github.com/codahale/hdrhistogram | ||
| - package: github.com/coreos/etcd |
There was a problem hiding this comment.
seems like another one we should pin?
There was a problem hiding this comment.
if there was a separate repo for raft, i'd agree, but this one is usually harmless to update since it rarely contains updates to raft.
| @@ -45,45 +47,45 @@ imports: | |||
| - name: github.com/codahale/hdrhistogram | |||
| version: 3a0bb77429bd3a61596f5e8a3172445844342120 | |||
| - name: github.com/coreos/etcd | |||
| version: aea9c6668fdc95fecacfabdc46e9c3f9b840ac94 | |||
| version: c31b1ab8d18ff7990a43bd258ca54f80c5a3c952 | |||
There was a problem hiding this comment.
nah, nothing of interest changed.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Performed with:
Manually pins risky packages:
Manually pins broken updates:
This reveals serious problems with the dependency update flow under
glide.
glide updatecompletely removes the vendor directory, whichmeans that the
.gitdirectory and all non-source content (README.md)are lost. The workflow needed to achieve a reasonable result is thus:
This script is checked in as
scripts/glide-up.sh.Running
git clean -dxninvendorproduces:github.com/cockroachdb/c-snappyandgithub.com/docker/distributionreport ignored files because the repositories track files which are
ostensibly ignored by various
.gitignores. This PR picks upcockroachdb/c-snappy#10 which fixes this for
that package.
However,
github.com/lightstep/lightstep-tracer-goreportinggithub.com/lightstep/lightstep-tracer-go/lightstep-tracer-commonasignored revealed a serious problem: this directory is a submodule, and
in our vendor checkout, it is empty. This suggests that
glidedid notcheck out the submodule, despite that being the behaviour of
go getsince https://golang.org/cl/9815.
glide updateis also terribly slow, clocking in around 1m30s.Finally, the move to glide of course breaks
glock-diff-parser, whichmeans the list of upstream changes must again be compiled manually. The
changes are:
Note that glide also "updated"
github.com/grpc-ecosystem/grpc-gatewayto an older version, losing an earlier fix
(grpc-ecosystem/grpc-gateway#256). My best
guess is that one of our dependencies uses this earlier version, likely
github.com/coreos/etcd. There seems to be no way to avoid thisbehaviour.
This change is