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.

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

build: bump dep to fix dependency resolution bug #28831

Merged
merged 1 commit into from
Aug 20, 2018

Conversation

benesch
Copy link
Contributor

@benesch benesch commented Aug 20, 2018

The version of dep we had vendored previously, v0.4.1, somehow dropped a
Windows-only dependency, github.com/shirou/w32, on the floor. Upgrade to
dep v0.5.0, which correctly brings in that dependency.

Release note: None

@benesch benesch requested review from dt and a team August 20, 2018 15:24
@cockroach-teamcity
Copy link
Member

This change is Reviewable

@benesch
Copy link
Contributor Author

benesch commented Aug 20, 2018

diff --git a/Gopkg.lock b/Gopkg.lock
[15:29:15]	[Step 5/5] index e6cc07516..d9fed0426 100644
[15:29:15]	[Step 5/5] --- a/Gopkg.lock
[15:29:15]	[Step 5/5] +++ b/Gopkg.lock
[15:29:15]	[Step 5/5] @@ -2,6 +2,7 @@
[15:29:15]	[Step 5/5]  
[15:29:15]	[Step 5/5]  
[15:29:15]	[Step 5/5]  [[projects]]
[15:29:15]	[Step 5/5] +  digest = "1:257d8e2c9287f4f019bcf07b17160db066cebe2e1d4549a9d825e3083de36c8e"
[15:29:15]	[Step 5/5]    name = "cloud.google.com/go"
[15:29:15]	[Step 5/5]    packages = [
[15:29:15]	[Step 5/5]      "compute/metadata",
[15:29:15]	[Step 5/5] @@ -12,115 +13,151 @@
[15:29:15]	[Step 5/5]      "internal/version",
[15:29:15]	[Step 5/5]      "storage",
[15:29:15]	[Step 5/5]    ]
[15:29:15]	[Step 5/5] +  pruneopts = "UT"
[15:29:15]	[Step 5/5]    revision = "0fd7230b2a7505833d5f69b75cbd6c9582401479"
[15:29:15]	[Step 5/5]    version = "v0.23.0"
[15:29:15]	[Step 5/5]  

🤔

The version of dep we had vendored previously, v0.4.1, somehow dropped a
Windows-only dependency, github.com/shirou/w32, on the floor. Upgrade to
dep v0.5.0, which correctly brings in that dependency.

Release note: None
@benesch
Copy link
Contributor Author

benesch commented Aug 20, 2018

Well that was utterly baffling. I could only reproduce that diff by running github-pull-request-make on my GCE worker. But now that the pruneopts lines are everywhere, my macOS checkout is happy to preserve them. Gah!

@benesch
Copy link
Contributor Author

benesch commented Aug 20, 2018

Ok, I'm not going to think too hard about this because everything is happy now. Merging!

bors r=dt

craig bot pushed a commit that referenced this pull request Aug 20, 2018
28831: build: bump dep to fix dependency resolution bug r=dt a=benesch

The version of dep we had vendored previously, v0.4.1, somehow dropped a
Windows-only dependency, github.com/shirou/w32, on the floor. Upgrade to
dep v0.5.0, which correctly brings in that dependency.

Release note: None

Co-authored-by: Nikhil Benesch <[email protected]>
@dt
Copy link
Member

dt commented Aug 20, 2018

good call -- if you gaze too long into the abyss of a package manager, the abyss also gazes into you

@craig
Copy link
Contributor

craig bot commented Aug 20, 2018

Build succeeded

@craig craig bot merged commit 42ad160 into cockroachdb:master Aug 20, 2018
@benesch benesch deleted the gopsutil-win branch August 21, 2018 21:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants