Skip to content
This repository has been archived by the owner on Oct 4, 2019. It is now read-only.

Fix vendoring issues #570

Merged
merged 2 commits into from
May 1, 2018
Merged

Fix vendoring issues #570

merged 2 commits into from
May 1, 2018

Conversation

tzdybal
Copy link
Contributor

@tzdybal tzdybal commented Apr 25, 2018

Fixes for fatih/color (I'm subscribed to the PR, I'll switch to master repository after PR is merged)
and sputnikvm-ffi problems.

Sources in vendor was not in sync with Gopkg.lock, and this was a root cause of the issue.

tzdybal added 2 commits April 25, 2018 13:33
solution: temporary switch to forked branch with proposed PR
with code that we require. After fatih/color#87
is merged, we can switch to original repository.
@tzdybal tzdybal requested review from r8d8 and whilei April 25, 2018 14:20
# TODO(tzdybal): monitor https://github.com/fatih/color/pull/87
source = "github.com/achilleas-k/color"
branch = "expose-colorised-stderr"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is contraining to branch ok? Or maybe tag or commit hash would be more solid?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remember about Gopkg.lock file - it stable until explicit call to dep update. And this is temporary solution anyways.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, just noticed

solution: temporary switch to forked branch with proposed PR
with code that we require. After fatih/color#87
is merged, we can switch to original repository.

LGTM

@tzdybal tzdybal merged commit d0ec4d1 into master May 1, 2018
@soc1c soc1c deleted the fix/vendor_folder branch June 19, 2019 12:29
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants