Skip to content
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

Revert #15793 for crashes and test failures on stylo #15814

Merged
merged 1 commit into from Mar 3, 2017

Conversation

Projects
None yet
4 participants
@bholley
Copy link
Contributor

commented Mar 3, 2017

Looks like #15793 busted autoland. Given that it's the weekend for Xidorn I'm going to back out the patch.

CC @upsuper


This change is Reviewable

Revert "Auto merge of #15793 - upsuper:animation, r=emilio,bholley"
This reverts commit 7cd4c69, reversing
changes made to 1b1fadb.
@highfive

This comment has been minimized.

Copy link

commented Mar 3, 2017

Heads up! This PR modifies the following files:

  • @emilio: components/style/properties/gecko.mako.rs, components/style/properties/shorthand/box.mako.rs, components/style/properties/longhand/box.mako.rs, components/style/matching.rs
@highfive

This comment has been minimized.

Copy link

commented Mar 3, 2017

warning Warning warning

  • These commits modify unsafe code. Please review it carefully!
@bholley

This comment has been minimized.

Copy link
Contributor Author

commented Mar 3, 2017

@bors-servo r=bholley p=10

@bors-servo

This comment has been minimized.

Copy link
Contributor

commented Mar 3, 2017

📌 Commit 3a56899 has been approved by bholley

@highfive highfive assigned bholley and unassigned metajack Mar 3, 2017

@bors-servo

This comment has been minimized.

Copy link
Contributor

commented Mar 3, 2017

⌛️ Testing commit 3a56899 with merge 3ca6ee2...

bors-servo added a commit that referenced this pull request Mar 3, 2017

Auto merge of #15814 - bholley:backout_15793, r=bholley
Revert #15793 for crashes and test failures on stylo

Looks like #15793 busted autoland. Given that it's the weekend for Xidorn I'm going to back out the patch.

CC @upsuper
@bors-servo

This comment has been minimized.

Copy link
Contributor

commented Mar 3, 2017

💔 Test failed - linux-rel-wpt

@bholley

This comment has been minimized.

Copy link
Contributor Author

commented Mar 3, 2017

@bors-servo retry

@bors-servo

This comment has been minimized.

Copy link
Contributor

commented Mar 3, 2017

⚡️ Previous build results for arm32, arm64, linux-dev, linux-rel-css, mac-dev-unit, mac-rel-wpt1, windows-gnu-dev, windows-msvc-dev are reusable. Rebuilding only android, linux-rel-wpt, mac-rel-css, mac-rel-wpt2...

@bors-servo

This comment has been minimized.

Copy link
Contributor

commented Mar 3, 2017

☀️ Test successful - android, arm32, arm64, linux-dev, linux-rel-css, linux-rel-wpt, mac-dev-unit, mac-rel-css, mac-rel-wpt1, mac-rel-wpt2, windows-gnu-dev, windows-msvc-dev
Approved by: bholley
Pushing 3ca6ee2 to master...

@bors-servo bors-servo merged commit 3a56899 into servo:master Mar 3, 2017

3 checks passed

continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details

bors-servo added a commit that referenced this pull request Mar 6, 2017

Auto merge of #15836 - upsuper:animation, r=<try>
Fix animation shorthand parsing (again)

This is from [bug 1343168](https://bugzilla.mozilla.org/show_bug.cgi?id=1343168) and mostly same as #15793 which was backed out in #15814.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/15836)
<!-- Reviewable:end -->

bors-servo added a commit that referenced this pull request Mar 7, 2017

Auto merge of #15836 - upsuper:animation, r=emilio,bholley
Fix animation shorthand parsing (again)

This is from [bug 1343168](https://bugzilla.mozilla.org/show_bug.cgi?id=1343168) and mostly same as #15793 which was backed out in #15814.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/15836)
<!-- Reviewable:end -->
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.