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

BUILDS: Use vendor directory instead of Godeps #438

Merged
merged 4 commits into from
Jun 17, 2016

Conversation

tomdee
Copy link
Contributor

@tomdee tomdee commented May 17, 2016

Closes #407

@tomdee tomdee force-pushed the vendor branch 2 times, most recently from a800802 to b656587 Compare May 18, 2016 00:21
@tomdee tomdee changed the title Move to vendor directory BUILDS: Use vendor directory instead of Godeps May 18, 2016
@tomdee
Copy link
Contributor Author

tomdee commented May 23, 2016

ping @philips @steveej Any objections to this going in?

@tomdee
Copy link
Contributor Author

tomdee commented Jun 14, 2016

Kind of blocked on #407 which is blocked on someone finding the time to do some GCE testing.

@@ -1,7 +1,6 @@
language: go
go:
- 1.4
- 1.5
Copy link
Contributor

Choose a reason for hiding this comment

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

should probably be testing with 1.5

Copy link
Contributor

Choose a reason for hiding this comment

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

and then add GO15VENDOREXPERIMENT=1 as an environment variable

@tomdee tomdee self-assigned this Jun 14, 2016
tomdee and others added 4 commits June 15, 2016 13:59
Keep the Godeps.json but store files in the vendor directly. This means
that there is no longer a need to rewrite import paths.
Project hosting provider code.google.com was shutdown beginning of this year.  This updates code.google.com dependencies.  Minor changes were required for oauth in GCE module.
@tomdee
Copy link
Contributor Author

tomdee commented Jun 15, 2016

OK, this is updated to move to glide. This was much easier for me to get working than Godep. (See coreos/docs#775 for general CoreOS support for migrating to glide)

This fairly large PR also updates some upstream deps which have been removed (the Google code ones) and update vishvanda/netlink

It updates the travis.yaml file to make it very similar to the CNI one. The crucial change is removal of Go 1.4 support (since a vendor directory is now being used)

@steveej / @philips Can I get a LGTM so I can get this merged?

@tomdee
Copy link
Contributor Author

tomdee commented Jun 15, 2016

I've verified that this fixes the vxlan port number problem.

@steveej steveej merged commit fe9a0cb into flannel-io:master Jun 17, 2016
@tomdee tomdee deleted the vendor branch January 23, 2017 22:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants