Skip to content
This repository was archived by the owner on Dec 13, 2018. It is now read-only.

Add "update-vendor.sh" script and vendor our current deps...#140

Merged
crosbymichael merged 2 commits intodocker-archive:masterfrom
tianon:vendor
Aug 5, 2014
Merged

Add "update-vendor.sh" script and vendor our current deps...#140
crosbymichael merged 2 commits intodocker-archive:masterfrom
tianon:vendor

Conversation

@tianon
Copy link
Copy Markdown
Contributor

@tianon tianon commented Aug 4, 2014

... (minus Docker, since that'd make a circle)

Also, updated .travis.yml to use the new "vendor" directory (since this is pretty pointless without that :D)

@crosbymichael
Copy link
Copy Markdown
Contributor

The circle of life

@crosbymichael
Copy link
Copy Markdown
Contributor

You should put this stuff in the Makefile for updating and pulling deps.

The Dockerfile does not work with this stuff

@tianon
Copy link
Copy Markdown
Contributor Author

tianon commented Aug 4, 2014

Ah, will do, thanks ❤️

@tianon
Copy link
Copy Markdown
Contributor Author

tianon commented Aug 4, 2014

You're still OK with the actual update-vendor script being separate right?

@crosbymichael
Copy link
Copy Markdown
Contributor

why not put it all in the makefile?

@tianon
Copy link
Copy Markdown
Contributor Author

tianon commented Aug 4, 2014

Because it's 48 lines long... :)

@crosbymichael
Copy link
Copy Markdown
Contributor

fine!

@tianon
Copy link
Copy Markdown
Contributor Author

tianon commented Aug 4, 2014

I moved the Travis logic into the Makefile and it made it much cleaner (since make is designed for these sorts of things), and now the Dockerfile works again and Travis uses the same code from the Makefile now.

@tianon
Copy link
Copy Markdown
Contributor Author

tianon commented Aug 4, 2014

... and of course Travis fails

@tianon
Copy link
Copy Markdown
Contributor Author

tianon commented Aug 4, 2014

There we go.

@vmarmol
Copy link
Copy Markdown
Contributor

vmarmol commented Aug 4, 2014

LGTM

@crosbymichael
Copy link
Copy Markdown
Contributor

i wish i could see our file's changes in a different commit instead of 12k lines of green ;)

@tianon
Copy link
Copy Markdown
Contributor Author

tianon commented Aug 4, 2014

FINE, whiner; give me a sec

@tianon
Copy link
Copy Markdown
Contributor Author

tianon commented Aug 4, 2014

There, rebased into two commits.

tianon added 2 commits August 4, 2014 17:24
…er, since that'd make a circle)

Also, updated .travis.yml to use the new "vendor" directory (since this is pretty pointless without that :D)

Signed-off-by: Andrew Page <[email protected]>
@crosbymichael
Copy link
Copy Markdown
Contributor

Well you didn't have to do it now. I was just letting you know you did something wrong ;)

@tianon
Copy link
Copy Markdown
Contributor Author

tianon commented Aug 4, 2014

crosbymeanie

@crosbymichael
Copy link
Copy Markdown
Contributor

@tianon it's ok, you should feel good that I hold you to higher standards and only expect the best from you ;)

@tianon
Copy link
Copy Markdown
Contributor Author

tianon commented Aug 4, 2014

True enough; ♥

@rjnagal
Copy link
Copy Markdown
Contributor

rjnagal commented Aug 5, 2014

LGTM

1 similar comment
@crosbymichael
Copy link
Copy Markdown
Contributor

LGTM

crosbymichael pushed a commit that referenced this pull request Aug 5, 2014
Add "update-vendor.sh" script and vendor our current deps...
@crosbymichael crosbymichael merged commit 54cf66e into docker-archive:master Aug 5, 2014
@tianon tianon deleted the vendor branch August 5, 2014 17:55
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