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

Multiple gecko backouts #17910

Merged
merged 2 commits into from Jul 29, 2017
Merged

Multiple gecko backouts #17910

merged 2 commits into from Jul 29, 2017

Conversation

@moz-servo-sync
Copy link
Contributor

moz-servo-sync commented Jul 28, 2017

Backed out changeset a417b9d7712d for vendoring bustage. r=backout on a CLOSED TREE

Backs out #17565


This change is Reviewable


Backed out changeset c424ad1c5f94 for build failures a=backout CLOSED TREE

Backs out #17892

… a CLOSED TREE

Backs out #17565
@moz-servo-sync
Copy link
Contributor Author

moz-servo-sync commented Jul 28, 2017

@bors-servo r+ force p=9001 treeclosed=9000

@bors-servo
Copy link
Contributor

bors-servo commented Jul 28, 2017

📌 Commit f022936 has been approved by moz-servo-sync

@highfive
Copy link

highfive commented Jul 28, 2017

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

@highfive
Copy link

highfive commented Jul 28, 2017

Heads up! This PR modifies the following files:

  • @aneeshusa: etc/ci/buildbot_steps.yml
  • @fitzgen: components/script/dom/servoparser/async_html.rs
  • @KiChjang: components/script/dom/servoparser/async_html.rs
@highfive
Copy link

highfive commented Jul 28, 2017

warning Warning warning

  • These commits modify unsafe code. Please review it carefully!
  • These commits modify script code, but no tests are modified. Please consider adding a test!
@jdm
Copy link
Member

jdm commented Jul 28, 2017

@bors-servo: treeclosed-

@bors-servo
Copy link
Contributor

bors-servo commented Jul 28, 2017

Testing commit f022936 with merge 2dfb22c...

bors-servo added a commit that referenced this pull request Jul 28, 2017
Backed out changeset a417b9d7712d for vendoring bustage. r=backout on a CLOSED TREE

Backed out changeset a417b9d7712d for vendoring bustage. r=backout on a CLOSED TREE

Backs out #17565
@jdm
Copy link
Member

jdm commented Jul 28, 2017

@bors-servo: treeclosed=9000

@moz-servo-sync moz-servo-sync changed the title Backed out changeset a417b9d7712d for vendoring bustage. r=backout on a CLOSED TREE Multiple gecko backouts Jul 28, 2017
@moz-servo-sync
Copy link
Contributor Author

moz-servo-sync commented Jul 28, 2017

@bors-servo r+ force p=9001 treeclosed=9000

@bors-servo
Copy link
Contributor

bors-servo commented Jul 28, 2017

💡 This pull request was already approved, no need to approve it again.

  • This pull request is currently being tested. If there's no response from the continuous integration service, you may use retry to trigger a build again.
@bors-servo
Copy link
Contributor

bors-servo commented Jul 28, 2017

📌 Commit 3f1af3e has been approved by moz-servo-sync

@KiChjang
Copy link
Member

KiChjang commented Jul 28, 2017

@bors-servo treeclosed-

@bors-servo
Copy link
Contributor

bors-servo commented Jul 28, 2017

Testing commit 3f1af3e with merge ef2d48d...

bors-servo added a commit that referenced this pull request Jul 28, 2017
Multiple gecko backouts

Backed out changeset a417b9d7712d for vendoring bustage. r=backout on a CLOSED TREE

Backs out #17565

<!-- 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/17910)
<!-- Reviewable:end -->

---

Backed out changeset c424ad1c5f94 for build failures a=backout CLOSED TREE

Backs out #17892
@KiChjang
Copy link
Member

KiChjang commented Jul 28, 2017

@bors-servo treeclosed=9000

@upsuper
Copy link
Member

upsuper commented Jul 29, 2017

So #17565 is probably innocent, and #17892 is gulity for the bustage on Gecko tree.

The reason is that #17892 makes style_traits depend on webrender, while Gecko already has a webrender vendored in another place in the tree, which causes this problem.

I'm not sure what should we do here.

There are two potential solutions:

  1. Split the types into an independent crate, and put it on crates.io, so that webrender and style_traits can share the crate, and Gecko can vendor the new crate as a third_party.
  2. Have Gecko not vendor webrender directly, but make webrender a third_party.

Both of them have drawbacks, though.

For the first one, it means updating that crate would take more effort. If those types aren't updated frequently, this might be the best solution.

For the second one, I suppose it would make development harder for Quantum Render project, because third_party is not mutable in Gecko, so they would not be able to update code simultaneously without more complicated setup. It would make it much like how Stylo project looks like before we vendor Servo into Gecko tree.

@bors-servo
Copy link
Contributor

bors-servo commented Jul 29, 2017

@bors-servo bors-servo merged commit 3f1af3e into servo:master Jul 29, 2017
3 checks passed
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
@upsuper
Copy link
Member

upsuper commented Jul 29, 2017

Oh, it seems #17908 is for resolving the problem of #17892.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

7 participants
You can’t perform that action at this time.