-
Notifications
You must be signed in to change notification settings - Fork 1k
Fix -no-vendor flag for ensure -update as well #1361
Conversation
The tests seem to be failing for other reasons than this commit. If you want me to add some test for the function I've added, just let me know :) |
Sorry for the confusion, we have been having stability problems with our CI tests lately. The AppVeyor build failure is not from your PR and I don't think the Travis one is either. I've kicked travis to see if I can get it pretty and green but don't worry I don't believe there's anything you need to change on your end! |
@asticode Thanks for the PR. Can you add a test for this? Like the ones in https://github.com/golang/dep/tree/master/cmd/dep/testdata/harness_tests/ensure/update |
@darkowlzz all done. Is that what you had in mind? |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Test looks good 👍
name = "github.com/sdboyer/deptest" | ||
packages = ["."] | ||
revision = "dummy" | ||
version = "dummy" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Let's set these to some proper values from https://github.com/sdboyer/deptest/releases.
@@ -0,0 +1,12 @@ | |||
// Copyright 2016 The Go Authors. All rights reserved. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
New file: 2017
😊
@darkowlzz all done |
755012f
to
c343662
Compare
@darkowlzz I've updated the changelog but the PR has now a minor conflict with the master/CHANGELOG.md. Do you want me to fix it or should you do it upon merging the PR? |
CHANGELOG.md
Outdated
@@ -4,6 +4,7 @@ BUG FIXES: | |||
|
|||
* Releases targeting Windows now have a `.exe` suffix (#1291). | |||
* Adaptively recover from dirty and corrupted git repositories in cache (#1279). | |||
* Fix `-no-vendor` flag for `ensure -update` ([#1361](https://github.com/golang/dep/pull/1361)) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
A period (.
) at the end and the full link is not required, just #1361 is enough.
@asticode rebase this PR on master and resolve the conflict :) |
@darkowlzz all good now :) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM!
quick rebase and we can merge |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
So there's good news and bad news. 👍 The good news is that everyone that needs to sign a CLA (the pull request submitter and all commit authors) have done so. Everything is all good there. 😕 The bad news is that it appears that one or more commits were authored by someone other than the pull request submitter. We need to confirm that all authors are ok with their commits being contributed to this project. Please have them confirm that here in the pull request. Note to project maintainer: This is a terminal state, meaning the |
I tried to resolve the conflict through the web editor but that didn't work. 😕 You should remove my commit since it won't be useful when rebasing. Just rebase from latest |
@ibrasho done |
Closing and reopening to trigger the cla bot. |
seems like the cla status will not change:
|
We need some super power here @sdboyer . |
done, thank you! |
Currently the
-no-vendor
flag doesn't work ondep ensure -update
.This PR fixes it.