Skip to content

/ 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

Update submodules and don't call setrlimit on Android #7051

Merged
merged 1 commit into from Aug 8, 2015
Merged

Update submodules and don't call setrlimit on Android #7051

merged 1 commit into from Aug 8, 2015

Conversation

@larsbergstrom
Copy link
Contributor

larsbergstrom commented Aug 6, 2015

r? @mbrubeck

Fixes #6432.

Review on Reviewable
@mbrubeck
Copy link
Contributor

mbrubeck commented Aug 6, 2015

-S-awaiting-review +S-awaiting-merge

Reviewed 4 of 4 files at r1.
Review status: :shipit: all files reviewed at latest revision, all discussions resolved, all commit checks successful.

Comments from the review on Reviewable.io
@mbrubeck
Copy link
Contributor

mbrubeck commented Aug 6, 2015

@bors-servo r+
@bors-servo
Copy link
Contributor

bors-servo commented Aug 6, 2015

📌 Commit 3504b13 has been approved by mbrubeck
@metajack
Copy link
Contributor

metajack commented Aug 6, 2015

@bors-servo p=10

Fast tracking since it is blocking time sensitive work.
@bors-servo
Copy link
Contributor

bors-servo commented Aug 6, 2015

⌛ Testing commit 3504b13 with merge 5507bf1...
bors-servo pushed a commit that referenced this pull request Aug 6, 2015
bors-servo
Auto merge of #7051 - larsbergstrom:android_updates, r=mbrubeck
5507bf1 
Update submodules and don't call setrlimit on Android

r? @mbrubeck 

Fixes #6432.

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/7051)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Aug 6, 2015

💔 Test failed - linux2
@mbrubeck
Copy link
Contributor

mbrubeck commented Aug 6, 2015 

/home/servo/.cargo/git/checkouts/ipc-channel-d95a23d1f1577bfc/master/platform/linux/mod.rs:700:5: 700:20 error: call to unsafe function requires unsafe function or block [E0133]
/home/servo/.cargo/git/checkouts/ipc-channel-d95a23d1f1577bfc/master/platform/linux/mod.rs:700     libc::unlink(c)
                                                                                                   ^~~~~~~~~~~~~~~
@mbrubeck mbrubeck self-assigned this Aug 6, 2015
@larsbergstrom
Copy link
Contributor Author

larsbergstrom commented Aug 6, 2015

Oh, poof. I need to get a linux machine to test on when my next h/w upgrade cycle comes. I'll try to get a fix in ipc-channel and find a working VM to test it on and then redo the PR.
@larsbergstrom larsbergstrom force-pushed the larsbergstrom:android_updates branch from 3504b13 to 6888661 Aug 7, 2015
@larsbergstrom
Copy link
Contributor Author

larsbergstrom commented Aug 7, 2015

re-r? @mbrubeck

Only change is an updated ipc channel to pick up https://github.com/pcwalton/ipc-channel/pull/5
@larsbergstrom
Copy link
Contributor Author

larsbergstrom commented Aug 7, 2015

oh, gah, wait, I need to rebase; bitrotted.
@larsbergstrom
Update submodules and don't call setrlimit on Android
Loading status checks…
3828624
@larsbergstrom larsbergstrom force-pushed the larsbergstrom:android_updates branch from 6888661 to 3828624 Aug 7, 2015
@larsbergstrom
Copy link
Contributor Author

larsbergstrom commented Aug 7, 2015

OK, rebased. Note that somebody else picked up the rust-mozjs update already, so all this one needs lockfile-wise now is ipc-channel.
@larsbergstrom
Copy link
Contributor Author

larsbergstrom commented Aug 7, 2015

r? @metajack
@highfive highfive assigned metajack and unassigned mbrubeck Aug 7, 2015
@jdm
Copy link
Member

jdm commented Aug 8, 2015

@bors-servo: r=mbrubeck
@bors-servo
Copy link
Contributor

bors-servo commented Aug 8, 2015

📌 Commit 3828624 has been approved by mbrubeck
@bors-servo
Copy link
Contributor

bors-servo commented Aug 8, 2015

⌛ Testing commit 3828624 with merge c528039...
bors-servo pushed a commit that referenced this pull request Aug 8, 2015
bors-servo
Auto merge of #7051 - larsbergstrom:android_updates, r=mbrubeck
Loading status checks…
c528039 
Update submodules and don't call setrlimit on Android

r? @mbrubeck 

Fixes #6432.

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/7051)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Aug 8, 2015

☀️ Test successful - android, gonk, linux1, linux2, mac1, mac2, mac3
@bors-servo bors-servo merged commit 3828624 into servo:master Aug 8, 2015
2 checks passed
2 checks passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details
@larsbergstrom larsbergstrom deleted the larsbergstrom:android_updates branch Sep 29, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@metajack metajack

Labels
S-awaiting-merge
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

None yet

6 participants
@larsbergstrom @mbrubeck @bors-servo @metajack @jdm @highfive
You can’t perform that action at this time.