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

Use a stable compiler for build-geckolib #12319

Merged
merged 8 commits into from
Jul 9, 2016
Merged

Use a stable compiler for build-geckolib #12319

merged 8 commits into from
Jul 9, 2016

Conversation

SimonSapin
Copy link
Member

@SimonSapin SimonSapin commented Jul 7, 2016 •
edited by larsbergstrom
Loading

  • There are tests for these changes OR
  • These changes do not require tests because CI already runs ./mach build-geckolib

This change is Reviewable

@highfive
Copy link

highfive commented Jul 7, 2016

Heads up! This PR modifies the following files:

  • @wafflespeanut: python/servo/command_base.py, python/servo/build_commands.py, python/servo/bootstrap_commands.py

@highfive highfive added the S-awaiting-review There is new code that needs to be reviewed. label Jul 7, 2016
@SimonSapin
Copy link
Member Author

r? @larsbergstrom

@highfive highfive assigned larsbergstrom and unassigned jdm Jul 7, 2016
@bors-servo
Copy link
Contributor

☔ The latest upstream changes (presumably #12294) made this pull request unmergeable. Please resolve the merge conflicts.

@highfive highfive added the S-needs-rebase There are merge conflict errors. label Jul 7, 2016
@SimonSapin
Copy link
Member Author

Rebased. r? @larsbergstrom

@larsbergstrom
Copy link
Contributor

Reviewed 4 of 4 files at r1, 2 of 2 files at r2, 2 of 2 files at r3, 2 of 2 files at r4, 3 of 3 files at r5, 8 of 8 files at r6, 2 of 2 files at r7, 2 of 2 files at r8, 2 of 2 files at r9, 3 of 3 files at r10.
Review status: all files reviewed at latest revision, 1 unresolved discussion.

python/servo/build_commands.py, line 372 [r3] (raw file):

        env = self.build_env()
        env["CARGO_TARGET_DIR"] = path.join(self.context.topdir, "ports/geckolib/target")

maybe target/geckolib instead? I'm a little wary of having another target/ dir buried inside the source tree instead of at toplevel.

Comments from Reviewable

@larsbergstrom
Copy link
Contributor

Feel free to r=me with that change (if you agree), as I'm on PTO today. Otherwise, I'll take a look this weekend :-)

Thanks for doing this!

@SimonSapin
Copy link
Member Author

@bors-servo r= larsbergstrom

Reviewed 2 of 2 files at r11.
Review status: all files reviewed at latest revision, 1 unresolved discussion.

python/servo/build_commands.py, line 372 [r3] (raw file):

Previously, larsbergstrom (Lars Bergstrom) wrote…

maybe target/geckolib instead? I'm a little wary of having another target/ dir buried inside the source tree instead of at toplevel.

Done.

Comments from Reviewable

@bors-servo
Copy link
Contributor

📌 Commit 6e21658 has been approved by ``

@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. S-needs-rebase There are merge conflict errors. labels Jul 8, 2016
@SimonSapin
Copy link
Member Author

@bors-servo r=larsbergstrom

@bors-servo
Copy link
Contributor

📌 Commit 6e21658 has been approved by larsbergstrom

@bors-servo
Copy link
Contributor

⌛ Testing commit 6e21658 with merge 195748e...

bors-servo pushed a commit that referenced this pull request Jul 8, 2016
Auto merge of #12319 - servo:stable-geckolib, r=larsbergstrom
195748e 
Use a stable compiler for build-geckolib

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

---
<!-- 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
- [x] These changes fix #11815 (github issue number if applicable).

<!-- Either: -->
- [ ] There are tests for these changes OR
- [x] These changes do not require tests because CI already runs `./mach build-geckolib`

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

💔 Test failed - linux-dev

@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 Jul 8, 2016
@SimonSapin
Copy link
Member Author

@bors-servo retry

  • Network error… hopefully temporary?
Error downloading Rust compiler: [Errno 1] _ssl.c:510: error:14077410:SSL routines:SSL23_GET_SERVER_HELLO:sslv3 alert handshake failure. The failing URL was: https://static.rust-lang.org/dist/rust-std-1.9.0-x86_64-unknown-linux-gnu.tar.gz

@bors-servo
Copy link
Contributor

⌛ Testing commit 6e21658 with merge d7fae26...

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

💔 Test failed - linux-dev

@highfive highfive removed S-awaiting-review There is new code that needs to be reviewed. S-needs-rebase There are merge conflict errors. labels Jul 8, 2016
@bors-servo
Copy link
Contributor

⌛ Testing commit e226288 with merge 01dcfee...

@highfive highfive added the S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. label Jul 8, 2016
bors-servo pushed a commit that referenced this pull request Jul 8, 2016
Auto merge of #12319 - servo:stable-geckolib, r=larsbergstrom+SimonSapin
01dcfee 
Use a stable compiler for build-geckolib

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

---
<!-- 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
- [x] These changes fix #11815 (github issue number if applicable).

<!-- Either: -->
- [ ] There are tests for these changes OR
- [x] These changes do not require tests because CI already runs `./mach build-geckolib`

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

💔 Test failed - linux-rel

@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 Jul 8, 2016
@SimonSapin
Copy link
Member Author

@bors-servo retry

  • With partially-downloaded (rustc but not std) 1.9.0 removed again from linux1 and commit e226288 to not go through the CDN.

@bors-servo
Copy link
Contributor

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

@SimonSapin SimonSapin mentioned this pull request Jul 8, 2016
Closed
@bors-servo
Copy link
Contributor

💔 Test failed - linux-rel

@highfive highfive added the S-tests-failed The changes caused existing tests to fail. label Jul 8, 2016
@highfive highfive added S-awaiting-review There is new code that needs to be reviewed. and removed S-tests-failed The changes caused existing tests to fail. labels Jul 8, 2016
@SimonSapin
Copy link
Member Author

@bors-servo r=larsbergstrom+SimonSapin

With an extra commit to download std even if rustc is already there.

@bors-servo
Copy link
Contributor

📌 Commit 38b6b24 has been approved by larsbergstrom+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 Jul 8, 2016
@bors-servo
Copy link
Contributor

⌛ Testing commit 38b6b24 with merge e50e4f9...

bors-servo pushed a commit that referenced this pull request Jul 8, 2016
Auto merge of #12319 - servo:stable-geckolib, r=larsbergstrom+SimonSapin
e50e4f9 
Use a stable compiler for build-geckolib

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

---
<!-- 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
- [x] These changes fix #11815 (github issue number if applicable).

<!-- Either: -->
- [ ] There are tests for these changes OR
- [x] These changes do not require tests because CI already runs `./mach build-geckolib`

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

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

@bors-servo bors-servo merged commit 38b6b24 into master Jul 9, 2016
@highfive highfive removed the S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. label Jul 9, 2016
@SimonSapin SimonSapin deleted the stable-geckolib branch July 9, 2016 00:18
@emilio emilio restored the stable-geckolib branch July 9, 2016 00:20
@emilio emilio deleted the stable-geckolib branch July 9, 2016 00:20
@upsuper upsuper mentioned this pull request Jul 11, 2016
Merged
5 tasks
bors-servo pushed a commit that referenced this pull request Jul 11, 2016
Auto merge of #12377 - upsuper:build-with-mozillabuild, r=metajack
184b1ba 
Build geckolib with MozillaBuild on Windows

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

Given #12319 removes the direct dependency of geckolib to gcc, geckolib is now compilable without gcc, and thus builds within MozillaBuild.

This changeset also changes the triple to use the MSVC backend rather than GNU for Windows . I'm not sure whether this change is necessary, but given we use MSVC to compile Gecko on Windows, I think we would eventually need this anyway. Triples for MinGW64 and Cygwin are unchanged, so that existing build targets should not be broken.

Servo itself is still not buildable with MozillaBuild. To make that work, some changes to mozjs are necessary as well.

It is probably worth some infra coverage to avoid regression.

---
<!-- 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 (on MinGW)
- [x] `./mach test-tidy` does not report any errors
- [ ] These changes fix #__ (github issue number if applicable).

<!-- Either: -->
- [ ] There are tests for these changes OR
- [x] These changes do not require tests because it only changes build system

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

r? @bholley

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

@larsbergstrom larsbergstrom

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Build geckolib with a stable Rust compiler
6 participants
@SimonSapin @highfive @bors-servo @larsbergstrom @aneeshusa @jdm