Skip to content
This repository has been archived by the owner on Sep 26, 2021. It is now read-only.

migrate vendor to golang/dep #4396

Merged
merged 7 commits into from
Mar 2, 2018
Merged

migrate vendor to golang/dep #4396

merged 7 commits into from
Mar 2, 2018

Conversation

unkaktus
Copy link
Contributor

Imprortant notice: this PR updates vendor of following packages:

  • github.com/docker/docker
  • golang.org/x/sys
  • google.golang.org/api

Probably removing of obsolete godep files should be here as well.

@dgageot
Copy link
Member

dgageot commented Feb 20, 2018

😍

@dgageot
Copy link
Member

dgageot commented Feb 22, 2018

@nogoegst Please ping me when it's ready to review

Signed-off-by: Ivan Markin <sw@nogoegst.net>
Signed-off-by: Ivan Markin <sw@nogoegst.net>
Signed-off-by: Ivan Markin <sw@nogoegst.net>
Signed-off-by: Ivan Markin <sw@nogoegst.net>
@GordonTheTurtle
Copy link

Please sign your commits following these rules:
https://github.com/moby/moby/blob/master/CONTRIBUTING.md#sign-your-work
The easiest way to do this is to amend the last commit:

$ git clone -b "dep" git@github.com:nogoegst/machine.git somewhere
$ cd somewhere
$ git rebase -i HEAD~842354611080
editor opens
change each 'pick' to 'edit'
save the file and quit
$ git commit --amend -s --no-edit
$ git rebase --continue # and repeat the amend for each commit
$ git push -f

Amending updates the existing PR. You DO NOT need to open a new one.

Signed-off-by: Ivan Markin <sw@nogoegst.net>
@unkaktus unkaktus changed the title WIP: migrate vendor to golang/dep migrate vendor to golang/dep Feb 28, 2018
@unkaktus
Copy link
Contributor Author

@dgageot, I think it is ready for review. 😉

@dgageot
Copy link
Member

dgageot commented Mar 1, 2018

  • make build works
  • USE_CONTAINER=true make build works

@dgageot
Copy link
Member

dgageot commented Mar 1, 2018

@dgageot
Copy link
Member

dgageot commented Mar 1, 2018

@nogoegst Forget about it. It's just me being drunk

Copy link
Member

@dgageot dgageot left a comment

Choose a reason for hiding this comment

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

Minor typos

CONTRIBUTING.md Outdated
#### Save the dependencies to `vendor/`

make dep-save
When you make a fresh copy of the repo, all the dependecies are in `vendor/` directory for the builds to work.
Copy link
Member

Choose a reason for hiding this comment

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

s/dependecies/dependencies/

CONTRIBUTING.md Outdated
make dep-save
When you make a fresh copy of the repo, all the dependecies are in `vendor/` directory for the builds to work.
This project uses [golang/dep](https://github.com/golang/dep) as vendor management tool. Please refer to `dep` documentation
on further details.
Copy link
Member

Choose a reason for hiding this comment

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

s/on/for/

CONTRIBUTING.md Outdated
#### Save the dependencies to `vendor/`

make dep-save
When you make a fresh copy of the repo, all the dependecies are in `vendor/` directory for the builds to work.
Copy link
Member

Choose a reason for hiding this comment

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

s/builds/build/

Copy link
Contributor Author

Choose a reason for hiding this comment

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

btw there are multiple options to build I guess. That's why there was 'builds'.

@dgageot
Copy link
Member

dgageot commented Mar 1, 2018

@nogoegst Please fix the typos and then I think we are good to go \o/

unkaktus added 2 commits March 1, 2018 17:03
Signed-off-by: Ivan Markin <sw@nogoegst.net>
Signed-off-by: Ivan Markin <sw@nogoegst.net>
@unkaktus
Copy link
Contributor Author

unkaktus commented Mar 1, 2018

@dgageot fixed, thanks!

@dgageot
Copy link
Member

dgageot commented Mar 1, 2018

LGTM

@dgageot
Copy link
Member

dgageot commented Mar 1, 2018

@vdemeester or @shin- would you have a moment to review?

Copy link

@vdemeester vdemeester left a comment

Choose a reason for hiding this comment

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

SGTM 🐸

@dgageot
Copy link
Member

dgageot commented Mar 2, 2018

@vdemeester Thanks!

@dgageot dgageot merged commit a950319 into docker:master Mar 2, 2018
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.

4 participants