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

Osx android fixes #5976

Merged
merged 2 commits into from May 8, 2015
Merged

Osx android fixes #5976

merged 2 commits into from May 8, 2015

Conversation

@larsbergstrom
Copy link
Contributor

larsbergstrom commented May 7, 2015

r? @metajack

Thanks to @alexcrichton for all the work to figure out our problems here!

Review on Reviewable
@larsbergstrom
Pick up acrichto's fixes to OSX cross build in submodules
dedf67a
@larsbergstrom
Ensure we use the android cross linker when building for android
Loading status checks…
4f8d0c6
@hoppipolla-critic-bot
Copy link

hoppipolla-critic-bot commented May 7, 2015

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

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.
@larsbergstrom
Copy link
Contributor Author

larsbergstrom commented May 7, 2015

or r? @glennw (pretty straightforward build system fixes)
@glennw
Copy link
Member

glennw commented May 8, 2015

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

bors-servo commented May 8, 2015

📌 Commit 4f8d0c6 has been approved by glennw
@bors-servo
Copy link
Contributor

bors-servo commented May 8, 2015

⌛ Testing commit 4f8d0c6 with merge 02cf89f...
bors-servo pushed a commit that referenced this pull request May 8, 2015
bors-servo
Auto merge of #5976 - larsbergstrom:osx-android-fixes, r=glennw
Loading status checks…
02cf89f 
r? @metajack 

Thanks to @alexcrichton for all the work to figure out our problems here!

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

bors-servo commented May 8, 2015

💔 Test failed - mac2
@larsbergstrom
Copy link
Contributor Author

larsbergstrom commented May 8, 2015

Hrm:

failures:

---- hide_after_create.html == hide_after_create_ref.html stdout ----
    thread 'hide_after_create.html == hide_after_create_ref.html' panicked at 'rendering difference: /tmp/servo-reftest-000095-diff.png', ../../tests/reftest.rs:335
@jdm
Copy link
Member

jdm commented May 8, 2015

That's #5958.
@jdm
Copy link
Member

jdm commented May 8, 2015

@bors-servo: retry
@bors-servo
Copy link
Contributor

bors-servo commented May 8, 2015

⚡ Previous build results for android, gonk, linux1, linux2, mac1 are reusable. Rebuilding only mac2...
@bors-servo
Copy link
Contributor

bors-servo commented May 8, 2015

☀️ Test successful - android, gonk, linux1, linux2, mac1, mac2
@bors-servo bors-servo merged commit 4f8d0c6 into servo:master May 8, 2015
2 checks passed
2 checks passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details
@bors-servo bors-servo mentioned this pull request May 8, 2015
Merged
@larsbergstrom larsbergstrom deleted the larsbergstrom:osx-android-fixes 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
No one assigned
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 @hoppipolla-critic-bot @glennw @bors-servo @jdm @highfive
You can’t perform that action at this time.