servo / servo

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

Add .cargo/config to .gitignore, move content to ports/android #4099

Closed

SimonSapin wants to merge 1 commit into servo:master from SimonSapin:cargo-config

+1 −0

Member

SimonSapin commented Nov 25, 2014

This allows using .cargo/config at the root of the repository for local path override, without risk of accidentally committing it.

However I don’t have the environment to test the Android build. Would this break it?


        Add .cargo/config to .gitignore, move content to ports/android

99e8358

This allows using .cargo/config at the root of the repository
for local path override, without risk of accidentally committing it.

hoppipolla-critic-bot commented Nov 25, 2014

Critic review: https://critic.hoppipolla.co.uk/r/3281

This is an external review system which you may optionally use for the code review of your pull request.

In order to help critic track your changes, please do not make in-place history rewrites (e.g. via git rebase -i or git commit --amend) when updating this pull request.

mbrubeck commented on `99e8358` Nov 25, 2014

r+

Contributor

bors-servo commented on `99e8358` Nov 25, 2014

saw approval from mbrubeck
at SimonSapin@99e8358

Contributor

bors-servo replied Nov 25, 2014

merging SimonSapin/servo/cargo-config = 99e8358 into auto

Contributor

bors-servo replied Nov 25, 2014

SimonSapin/servo/cargo-config = 99e8358 merged ok, testing candidate = b5d6864

Contributor

bors-servo replied Nov 25, 2014

all tests pass:
success: http://build.servo.org/builders/linux1/builds/56
success: http://build.servo.org/builders/linux2/builds/56
success: http://build.servo.org/builders/android/builds/123
success: http://build.servo.org/builders/mac1/builds/273
success: http://build.servo.org/builders/mac2/builds/273

Contributor

bors-servo replied Nov 25, 2014

fast-forwarding master to auto = b5d6864

bors-servo pushed a commit that referenced this pull request


        auto merge of #4099 : SimonSapin/servo/cargo-config, r=mbrubeck

b5d6864

This allows using `.cargo/config` at the root of the repository for local path override, without risk of accidentally committing it.

However I don’t have the environment to test the Android build. Would this break it?

bors-servo closed this

This was referenced Nov 27, 2014

Switch android to using glutin. Remove GLUT port. #4115

Closed

Move the root Cargo.toml to components/servo, and warn when Cargo is run directly #4140

Merged

bors-servo pushed a commit that referenced this pull request


        auto merge of #4140 : SimonSapin/servo/no-root-cargo-toml, r=Manishearth

c8fd6f7

This fixes #3957, and allow #4115 not to regress #4099.

bors-servo pushed a commit that referenced this pull request


        auto merge of #4140 : SimonSapin/servo/no-root-cargo-toml, r=Manishearth

7f01b0e

This fixes #3957, and allow #4115 not to regress #4099.

SimonSapin deleted the SimonSapin:cargo-config branch

bors-servo pushed a commit that referenced this pull request


        auto merge of #4140 : SimonSapin/servo/no-root-cargo-toml, r=mbrubeck

a51aca4

This fixes #3957, and allow #4115 not to regress #4099.

bors-servo pushed a commit that referenced this pull request


        auto merge of #4140 : SimonSapin/servo/no-root-cargo-toml, r=Manishearth

991d238

This fixes #3957, and allow #4115 not to regress #4099.

bors-servo pushed a commit that referenced this pull request


        auto merge of #4140 : SimonSapin/servo/no-root-cargo-toml, r=Manishearth

2de1835

This fixes #3957, and allow #4115 not to regress #4099.

bors-servo pushed a commit that referenced this pull request


        auto merge of #4140 : SimonSapin/servo/no-root-cargo-toml, r=SimonSapin

873ca6c

This fixes #3957, and allow #4115 not to regress #4099.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

You can’t perform that action at this time.