Skip to content

Use Travis trusty infrastructure #29159

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

Merged
merged 1 commit into from
Oct 21, 2015
Merged

Conversation

arcnmx
Copy link
Contributor

@arcnmx arcnmx commented Oct 19, 2015

Moves back away from docker but still uses the GCE infrastructure with a system-installed LLVM.

See http://docs.travis-ci.com/user/trusty-ci-environment/

@rust-highfive
Copy link
Contributor

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @brson (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. The way Github handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

@arcnmx
Copy link
Contributor Author

arcnmx commented Oct 19, 2015

I can't test this myself since my own account has a 50 minute build time limit, but generally docker just seemed kind of redundant even if it only maybe adds a few minutes to the build time. With Rust's special travis settings hopefully it builds!

Also, considering that travis has been blocked up for a while, someone might want to cancel these bors commit tests to help travis catch up to all PRs in a decent time.

@alexcrichton
Copy link
Member

Hm so on one hand I kinda like using docker because it makes the builds very easily reproducible as well as clearly showing us what our dependencies are (I think the Travis images come with some extra goodies by default), but on the other hand it does seem like it may just be unnecessary here. I'm fine merging, just waiting on travis to report back!

@arcnmx
Copy link
Contributor Author

arcnmx commented Oct 19, 2015

Makes sense, I also considered the same thing (and wondered if I should keep the dockerfile around just in case). Travis does have a minimal image though, which should help with that concern. I'll give it a try after this queued build hits.

@frewsxcv
Copy link
Member

You can use the addons > apt > packages feature in travis.yml files to specify apt deps instead of manually installing them if you want. We do that in servo

https://github.com/servo/servo/blob/master/.travis.yml

@frewsxcv
Copy link
Member

More info here

http://docs.travis-ci.com/user/apt/

@arcnmx
Copy link
Contributor Author

arcnmx commented Oct 19, 2015

Ah right, I was doing that on the container infrastructure but moved to the commands on GCE. I'll see about reverting that back again.

EDIT: it doesn't look like the sources we need are whitelisted. Just pushed a version that uses the minimal GCE image instead.

@sanxiyn
Copy link
Member

sanxiyn commented Oct 20, 2015

While we're at it, can we remove or revise "Real testing happens on http://buildbot.rust-lang.org/" comment? It was introduced in #26224 when Travis only ran "make tidy", therefore no real testing. Maybe "Testing also happens" etc.

@arcnmx
Copy link
Contributor Author

arcnmx commented Oct 20, 2015

Well, it's still correct in that buildbot tests all supported platforms while Travis only tests x86_64 Linux. It's at best supplemental smoke testing, though I'm open to suggestions for a better explanation there.

@alexcrichton
Copy link
Member

OK looks like this passed just fine, so I'd be fine merging with the apt addons section that @frewsxcv mentioned!

@arcnmx
Copy link
Contributor Author

arcnmx commented Oct 20, 2015

I wasn't able to get the apt addon approach to work as the sources for trusty don't seem to be in their whitelist.

See my various attempts here >_>

@alexcrichton
Copy link
Member

@bors: r+ 1181ca4

ah ok!

@bors
Copy link
Collaborator

bors commented Oct 20, 2015

⌛ Testing commit 1181ca4 with merge b69c39c...

@alexcrichton
Copy link
Member

@bors: retry force

@bors
Copy link
Collaborator

bors commented Oct 20, 2015

⌛ Testing commit 1181ca4 with merge d8acb03...

bors added a commit that referenced this pull request Oct 20, 2015
Moves back away from docker but still uses the GCE infrastructure with a system-installed LLVM. 

See http://docs.travis-ci.com/user/trusty-ci-environment/
@bors bors merged commit 1181ca4 into rust-lang:master Oct 21, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants