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.

Sign up for GitHub

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

Jump to bottom

Revert "Remove mako.zip" #13171

Merged
merged 1 commit into from Sep 4, 2016
Merged

Revert "Remove mako.zip" #13171

merged 1 commit into from Sep 4, 2016

Conversation

emilio
Copy link
Member

@emilio emilio commented Sep 4, 2016 •
edited by larsbergstrom

Stylo doesn't use Servo's virtualenv, so we need to integrate it into Gecko's build before doing this.

  • ./mach build -d does not report any errors
  • ./mach test-tidy does not report any errors
  • There are tests for these changes OR

This reverts commit 95e3f83.

This change is Reviewable

@emilio
Revert "Remove mako.zip"
e8d7184 
This reverts commit 95e3f83.
@highfive
Copy link

highfive commented Sep 4, 2016

Heads up! This PR modifies the following files:

  • @bholley: components/style/properties/build.py, components/style/properties/Mako-0.9.1.zip
  • @wafflespeanut: python/requirements.txt

@highfive highfive added the S-awaiting-review There is new code that needs to be reviewed. label Sep 4, 2016
@highfive
Copy link

highfive commented Sep 4, 2016

warning Warning warning

  • These commits modify style code, but no tests are modified. Please consider adding a test!

@emilio
Copy link
Member Author

emilio commented Sep 4, 2016 •
edited

r? @SimonSapin

@highfive highfive assigned Manishearth and unassigned glennw Sep 4, 2016
@emilio emilio assigned SimonSapin and unassigned Manishearth Sep 4, 2016
@SimonSapin
Copy link
Member

@bors-servo r+

@bors-servo
Copy link
Contributor

📌 Commit e8d7184 has been approved by SimonSapin

@highfive highfive added S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. and removed S-awaiting-review There is new code that needs to be reviewed. labels Sep 4, 2016
@bors-servo
Copy link
Contributor

⌛ Testing commit e8d7184 with merge fe9d909...

bors-servo pushed a commit that referenced this pull request Sep 4, 2016
Auto merge of #13171 - emilio:mako-is-back, r=SimonSapin
fe9d909 
Revert "Remove mako.zip"

<!-- Please describe your changes on the following line: -->

Stylo doesn't use Servo's virtualenv, so we need to integrate it into Gecko's build before doing this.

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors

<!-- Either: -->
- [x] There are tests for these changes OR

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

This reverts commit 95e3f83.

<!-- 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/13171)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

💔 Test failed - mac-rel-wpt

@highfive highfive added S-tests-failed The changes caused existing tests to fail. and removed S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. labels Sep 4, 2016
@highfive
Copy link

highfive commented Sep 4, 2016 

  ▶ ERROR [expected OK] /webgl/conformance-1.0.3/conformance/ogles/GL/build/build_009_to_016.html
  └   → gl.getProgramInfoLog is not a function

@bholley
Copy link
Contributor

bholley commented Sep 4, 2016 •
edited by emilio

@bors-servo retry

@bors-servo
Copy link
Contributor

⚡ Previous build results for arm32, arm64, linux-dev, linux-rel, mac-dev-unit, mac-rel-css, windows-dev are reusable. Rebuilding only mac-rel-wpt...

@bors-servo
Copy link
Contributor

⚡ Previous build results for arm32, arm64, linux-dev, linux-rel, mac-dev-unit, mac-rel-css, windows-dev are reusable. Rebuilding only mac-rel-wpt...

1 similar comment
@bors-servo
Copy link
Contributor

⚡ Previous build results for arm32, arm64, linux-dev, linux-rel, mac-dev-unit, mac-rel-css, windows-dev are reusable. Rebuilding only mac-rel-wpt...

@wafflespeanut wafflespeanut mentioned this pull request Sep 4, 2016
Closed
@bors-servo
Copy link
Contributor

💔 Test failed - mac-rel-wpt

@highfive highfive added the S-tests-failed The changes caused existing tests to fail. label Sep 4, 2016
@highfive
Copy link

highfive commented Sep 4, 2016 

  ▶ ERROR [expected OK] /webgl/conformance-1.0.3/conformance/ogles/GL/build/build_001_to_008.html
  └   → gl.getProgramInfoLog is not a function

@wafflespeanut
Copy link
Contributor

@bors-servo retry #13165

@bors-servo
Copy link
Contributor

⚡ Previous build results for arm32, arm64, linux-dev, linux-rel, mac-dev-unit, mac-rel-css, windows-dev are reusable. Rebuilding only mac-rel-wpt...

@bors-servo
Copy link
Contributor

💔 Test failed - mac-rel-wpt

@highfive highfive added the S-tests-failed The changes caused existing tests to fail. label Sep 4, 2016
@highfive
Copy link

highfive commented Sep 4, 2016 

  ▶ ERROR [expected OK] /webgl/conformance-1.0.3/conformance/ogles/GL/build/build_001_to_008.html
  └   → gl.getProgramInfoLog is not a function

@wafflespeanut
Copy link
Contributor

@bors-servo retry

Well, this is recurring.

@bors-servo
Copy link
Contributor

⚡ Previous build results for arm32, arm64, linux-dev, linux-rel, mac-dev-unit, mac-rel-css, windows-dev are reusable. Rebuilding only mac-rel-wpt...

@bors-servo
Copy link
Contributor

☀️ Test successful - arm32, arm64, linux-dev, linux-rel, mac-dev-unit, mac-rel-css, mac-rel-wpt, windows-dev

@bors-servo bors-servo merged commit e8d7184 into servo:master Sep 4, 2016
@emilio emilio deleted the mako-is-back branch September 4, 2016 08:59
@aneeshusa aneeshusa mentioned this pull request Apr 18, 2017
Merged
5 tasks
bors-servo pushed a commit that referenced this pull request Apr 18, 2017
Auto merge of #16505 - aneeshusa:stop-mach-bootstrap-from-segfaulting…
36d7c1c 
…, r=Wafflespeanut

Stop mach bootstrap from segfaulting

<!-- Please describe your changes on the following line: -->

See the commit message for details; the top-level import of Mako causes `./mach bootstrap` to segfault in glibc while exiting, seems to have to do with the native `_speedups.so` library of MarkupSafe, a Mako dependency.

Needed for servo/saltfs#631.
cc @emilio to make sure this is OK for stylo (e.g. #13171)

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [ ] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [x] These changes fix #12103 (github issue number if applicable).

<!-- Either: -->
- [ ] There are tests for these changes OR
- [x] These changes do not require tests because the test is part of servo/saltfs#631

<!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.-->

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

<!-- 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/16505)
<!-- Reviewable:end -->
bors-servo pushed a commit that referenced this pull request Apr 18, 2017
Auto merge of #16505 - aneeshusa:stop-mach-bootstrap-from-segfaulting…
7413c71 
…, r=Wafflespeanut

Stop mach bootstrap from segfaulting

<!-- Please describe your changes on the following line: -->

See the commit message for details; the top-level import of Mako causes `./mach bootstrap` to segfault in glibc while exiting, seems to have to do with the native `_speedups.so` library of MarkupSafe, a Mako dependency.

Needed for servo/saltfs#631.
cc @emilio to make sure this is OK for stylo (e.g. #13171)

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [ ] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [x] These changes fix #12103 (github issue number if applicable).

<!-- Either: -->
- [ ] There are tests for these changes OR
- [x] These changes do not require tests because the test is part of servo/saltfs#631

<!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.-->

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

<!-- 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/16505)
<!-- Reviewable:end -->
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@SimonSapin SimonSapin

Labels
S-tests-failed The changes caused existing tests to fail.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
8 participants
@emilio @highfive @SimonSapin @bors-servo @bholley @wafflespeanut @Manishearth @glennw