Commit Graph

108 Commits

Author SHA1 Message Date
E. Dunham
3e7eb9ef7b servo: Merge #17734 - Run chaos_monkey_test on the non-gating builder (from edunham:nogate); r=jdm
re https://github.com/servo/servo/issues/10927, https://github.com/servo/saltfs/pull/360

the old salt pr became a salt pr + a servo pr due to the buildbot steps living over here now.

Source-Repo: https://github.com/servo/servo
Source-Revision: 8e14d936022b863061ffc42cccc86922be03951a

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 1ac0eb59d5103e203594f68b719cc34e530bc4d3
2017-07-14 11:10:24 -07:00
Nazım Can Altınova
3275a0d69a servo: Merge #17272 - Add an index.html page for geckolib docs (from canaltinova:geckolib-doc); r=jdm
We have successfully added docs for geckolib to `doc.servo.org` in #17243 but we still can't use http://doc.servo.org/geckolib to navigate to geckolib docs because of the lack of an index.html file.

---
- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors

<!-- Either: -->
- [X] These changes do not require tests because they are CI changes.

Source-Repo: https://github.com/servo/servo
Source-Revision: 8085a3717822e70185a7deb50e3250a3a86ab857

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 12a3f83d9be02206b7b7ccf71ce6d02b10df16af
2017-06-12 08:38:16 -07:00
Josh Matthews
bb12ac5c69 servo: Merge #17244 - Copy all geckolib dependency docs for upload (from servo:jdm-patch-3); r=emilio
Attempt to fix the doc uploading process which is permafailing in #17243.

Source-Repo: https://github.com/servo/servo
Source-Revision: ab77d03c3bb6466eb55af5f445cdc805f6a05847

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 31d9c48bbcdcddc8c22bc76acae6b40af0fd023e
2017-06-10 18:03:30 -07:00
Aneesh Agrawal
3915c8b568 servo: Merge #17115 - Disable macbrew updater (from aneeshusa:temporarily-disable-macbrew-updater); r=emilio
<!-- 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: -->
- [ ] `./mach build -d` does not report any errors
- [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 _____

<!-- 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. -->

Source-Repo: https://github.com/servo/servo
Source-Revision: 1aa3eec66bf88f58b547a4ac71c353e774ecc790

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : c263ab59c07e33f1137b78c836e89f20924d7702
2017-05-31 17:00:15 -07:00
Imanol Fernandez
0a31d50d11 servo: Merge #17008 - Make armv7-linux-androideabi default target on Android (from MortimerGoro:android_default_armv7); r=larsberg
<!-- Please describe your changes on the following line: -->

See https://github.com/servo/servo/issues/11921

After fixing problematic dependencies this is the last step to support armv7-linux-androideabi target on Android:

- Updates skia dependency to fix a linker error. See https://github.com/servo/skia/pull/136
- Fixes specifying android targets on `./mach package` and `./mach install` steps:
  -`./mach package --release --target=arm-linux-androideabi`
  -`./mach package --release --target=armv7-linux-androideabi`
  -`./mach package --release --target=aarch64-linux-android`
- Make `armv7-linux-androideabi`default when `--android` param is used in build, package or install commands

---
<!-- 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 #11921 (github issue number if applicable).

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

<!-- 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. -->

Source-Repo: https://github.com/servo/servo
Source-Revision: a694f70acf2f011da816a24716d6501ab153c64e

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : aac3cdcf833b6cd64b5f81d27ae213d7272fe08d
2017-05-31 16:29:19 -05:00
Anthony Ramine
66cb2e3b5e servo: Merge #17107 - Revert "Auto merge of #16566" (from servo:android); r=larsbergstrom
Source-Repo: https://github.com/servo/servo
Source-Revision: c018340a138849b9b3552fed159fdde9b2be9697

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 80c9e028bea3572e181ca39a02202140b798d48a
2017-05-31 07:14:39 -05:00
Aneesh Agrawal
0de1fdcf67 servo: Merge #16566 - Remove redundant ANDROID_SDK variables (from aneeshusa:remove-android-sdk-override); r=larsbergstrom
The r25.2.3 Android SDK has been made the current version in saltfs,
so we no longer need to override it via environment variable.

Follow up to servo/servo#15773.
Requires servo/saltfs#644.

<!-- 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: -->
- [ ] `./mach build -d` does not report any errors
- [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
- [ ] These changes do not require tests because _____

<!-- 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. -->

Source-Repo: https://github.com/servo/servo
Source-Revision: 779edd7c4aaf900f12fab378a378b0fc52d4c628

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 0b6b6b2cb7e84cd3e6f492df9489a98464fa9d79
2017-05-30 21:09:40 -05:00
Aneesh Agrawal
dede65c36c servo: Merge #17085 - Fix ./mach upload-nightly macbrew (from aneeshusa:fix-mach-upload-nightly-for-macbrew); r=larsbergstrom
<!-- Please describe your changes on the following line: -->
Fix a few issues with the Homebrew repository updating.
Follow-up to #16565; should finish off #17045.

Lightly smoke-tested locally this time.

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

<!-- Either: -->
- [ ] There are tests for these changes OR
- [x] These changes do not require tests because they will be tested on the builders

<!-- 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. -->

Source-Repo: https://github.com/servo/servo
Source-Revision: 011a7adf56d9a58be9707cdeeeb824c4b70df84a

--HG--
rename : servo/etc/ci/servo-binary-formula.rb.in => servo/python/servo/servo-binary-formula.rb.in
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 4ba5f84821956f6ec898cabeff5d212d6e276932
2017-05-30 14:06:59 -05:00
Cesar Carruitero
d1cde0b652 servo: Merge #16940 - upload geckolib docs to doc.servo.org (from ccarruitero:fix16887); r=emilio
<!-- Please describe your changes on the following line: -->
add `geckolib` docs into upload docs script

---
<!-- 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
- [ ] `./mach test-tidy` does not report any errors
- [X] These changes fix #16887

<!-- Either: -->
- [ ] There are tests for these changes OR
- [X] These changes do not require tests because are in ci script

<!-- 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. -->

Source-Repo: https://github.com/servo/servo
Source-Revision: 166abb82bc1ab56343002d8acd365c5d20795ba0

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 1974b178c1702367b804595142d4de50d7e4bf44
2017-05-29 09:04:55 -05:00
Lars Bergstrom
db1e0aba1b servo: Merge #17003 - Split out some mac builds (from larsbergstrom:more_mac_builders); r=jdm
Splits out the WPT and CSS tests on mac to twice as many builders, each.

Source-Repo: https://github.com/servo/servo
Source-Revision: 4ec2e8b4c56c914af9fd570acaef85460f322fa9

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 27010c752bd21fca1fd40920efb307acf5477910
2017-05-27 21:08:18 -05:00
Aneesh Agrawal
04992e38a1 servo: Merge #16565 - Convert nightly upload script to Python (from aneeshusa:move-upload-nightly-script-to-python); r=metajack
Now that MinGW and MSYS have been removed from the Windows builders,
bash is not available to run the previous upload_nightlies.sh script.
Convert the script to Python 2 for cross-platform support.
Additionally, switch to the `boto3` library for easy uploading
without needing to install `s3cmd`,
and move the code into mach for easy `boto3` installation
as the new `./mach upload-nightly` command.

Also, hard-code the paths to the packages instead of using
globs to look for them, as the paths are static.
(The paths used to contain timestamps,
but we now insert timestamps when uploading to S3
to improve reproducibility.)

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

<!-- Either: -->
- [ ] There are tests for these changes OR
- [x] These changes do not require tests because Buildbot will test them.

<!-- 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. -->

Source-Repo: https://github.com/servo/servo
Source-Revision: 9468fae0d443b2a8b9a7694f917dc097ac6c7e60

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 593f32ad93c14cb66dd36dfdb41bb36b41a0c558
2017-05-22 18:11:19 -05:00
Imanol Fernandez
8149284ed3 servo: Merge #16812 - Update blurdroid and set ANDROID_SDK in build_steps.yml (from MortimerGoro:update_blurdroid); r=jdm
<!-- Please describe your changes on the following line: -->

See https://github.com/servo/saltfs/issues/661. Update blurdroid and set ANDROID_SDK in build_steps.yml

cc @aneeshusa @larsbergstrom

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

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

<!-- 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. -->

Source-Repo: https://github.com/servo/servo
Source-Revision: 060a651f8847189e8d0830e35bbf4497014f01d5

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : c70047d684d85626b0fe84ce8df83d7336df02a5
2017-05-11 10:32:52 -05:00
Nathan Froyd
5248783910 servo: Merge #16303 - bump required rayon version to 0.7 (from froydnj:rayon-version-bump); r=jdm
...and bring jpeg-decoder along for the ride.  Minor tweaks were necessary because of rayon API changes.

- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors

Source-Repo: https://github.com/servo/servo
Source-Revision: fc3a7d03f2b0c5292e7414e7555fb75ae0b1d663

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 5141549e2d1236f5d11df90f69de7463813e6a70
2017-05-08 21:36:48 -05:00
Imanol Fernandez
cda127d899 servo: Merge #15773 - Android life cycle improvements and Gradle integration (from MortimerGoro:android_improvements); r=larsbergstrom,fabricedesre
This PR includes Android life cycle Improvements and Gradle integration for android packaging.

Android life cycle improvements are implemented in both the new [MainActivity](https://github.com/servo/servo/compare/master...MortimerGoro:android_improvements?expand=1#diff-f43708b102e98272c2af7454b8846927) and native code in this related PR: https://github.com/servo/glutin/pull/117
- Properly handle the life cycle of the Android Activity: manage EGLContext lost & restore, and animation loop pause/resume when the app goes to background/foreground or orientation changes. In the current upstream Servo crashes when the app goes to background, activity stops or changes orientation
- Handle event loop awake for Servo Animation loop
- Handle screen resize & orientation events
- Implement new keep_screen_on preference which keeps Android device's screen from ever going to sleep: very useful for games or WebVR
- Implement a full screen mode enabled by preference: very useful for games or WebVR
- Implement new shell.native-orientation preference which allows to lock the Activity to a specific orientation
- Automatically sync new android assets to sdcard when the Android version code is changed.  In the current upstream only the existence of the folder is check but resources are not updated

ofscreen_gl_context is updated to fix this: https://github.com/emilio/rust-offscreen-rendering-context/pull/83

This PR integrates Gradle build system for android packaging. Most of the code is implemented in this [build.gradle](https://github.com/servo/servo/compare/master...MortimerGoro:android_improvements?expand=1#diff-89cdb9324addb994cdba0a158b209547) . We can get rid of [build-apk](https://github.com/servo/servo/compare/master...MortimerGoro:android_improvements?expand=1#diff-40f5a7cf22f94aad059b2c1795347f5e) and manual jar dependency copying in the [package_commands.py](https://github.com/servo/servo/compare/master...MortimerGoro:android_improvements?expand=1#diff-0d425b142c8d10ae6ac1f3711fb5c23a). The correct version of gradle is automatically downloaded using the gradlew wrapper.

Some improvements:
- Allows to include more complex android dependencies/SDKs like AARs, manifest auto-merging and more.
- Improved packaging process: The gradle project is always in the same folder, it uses relative paths for everything (assets, native libraries) and outputs the apk into the correct target folder in servo. In the current upstream, ant/python build system copies the manifest, project, resources and jars each time so you end with multiple copies of the same files.
- Improved dependency declaration. We do not have to manually copy jar dependencies in the python script anymore. The gradle build scripts itself is able to search for the dependencies in the correct servo target folder.
- Supports packaging apks with different architectures: armeabi, armeabi-v7a, aarch64. We still need to fix some native servo compilation issues with armeabi-v7a, aarch64 due to dependencies which use `make`. I'll push this changes in a separate PR of the python build files but the gradle file is already ready to handle that.
- We can easily create product flavors for different versions of Servo. For example a default browser, a WebVR browser with additional dependencies or a Servo android Webview component
- Fixes minor.major.52 build error when blurdroid cargo dependency is compiled using java8 (the default in new Linux machines). The gradle build file enables the new Jack compiler which supports Java8 dependencies.
- The project can be opened with Android Studio and run the brand new GPU debugger on any Android phone. I'll add some docs in the Wiki about 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
- [x] These changes fix #14568 (github issue number if applicable).

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

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

Source-Repo: https://github.com/servo/servo
Source-Revision: 2b5c17c43a517b6d6bd981f5fa905536dddd3beb

--HG--
rename : servo/support/android/apk/AndroidManifest.xml => servo/support/android/apk/app/src/main/AndroidManifest.xml
rename : servo/support/android/apk/res/mipmap/servo.png => servo/support/android/apk/app/src/main/res/mipmap/servo.png
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 2da8cf56223c150832fddb3e8878432f4d64bc6e
2017-04-21 15:52:13 -05:00
Aneesh Agrawal
c656b63264 servo: Merge #16487 - Automatically clean old nightlies (from aneeshusa:automatically-clean-old-nightlies); r=larsbergstrom
<!-- Please describe your changes on the following line: -->

Automatically clean old rustc and cargo nightlies on our builders up to preserve disk space.

---
<!-- 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
- [ ] These changes fix #12103 and help with servo/saltfs#321 (github issue number if applicable).

<!-- Either: -->
- [ ] There are tests for these changes OR
- [x] These changes do not require tests because tested manually

<!-- 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. -->

Source-Repo: https://github.com/servo/servo
Source-Revision: a754c10e79ef237b500bbf173eb7ba43529e51eb

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : c0e38115bf4546ca27576a431d259025e52b8c2b
2017-04-18 11:00:27 -05:00
UK992
d4991664c5 servo: Merge #16464 - Upload zipfile of Windows nightly build (from UK992:upload-nightly); r=larsbergstrom
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [x] These changes fix #16437

Source-Repo: https://github.com/servo/servo
Source-Revision: 2b353e04f0056942276232fa38fbd664ee2c4032

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : b6995c30499fc1090ade7967c17e18b87461ad9f
2017-04-18 09:50:23 -05:00
Aneesh Agrawal
41d138363e servo: Merge #16505 - Stop mach bootstrap from segfaulting (from aneeshusa:stop-mach-bootstrap-from-segfaulting); r=Wafflespeanut
<!-- 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. -->

Source-Repo: https://github.com/servo/servo
Source-Revision: 7413c716fb954c1dd27c39929e27bd7b4b188720

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : b994fad350458883a2b45f665bcbbc69abaccd68
2017-04-18 06:10:46 -05:00
Aneesh Agrawal
ac45515c22 servo: Merge #16468 - Remove windows-gnu build code (from aneeshusa:remove-windows-gnu); r=metajack
<!-- Please describe your changes on the following line: -->

This is a follow-up to servo/saltfs#620.

There are three other places `windows-gnu` is mentioned, I'm not sure if they can also be removed or not:
- `nightly-x86_64-pc-windows-gnu` is listed as a target in the `appveyor.yml` build matrix
- 2 uses inside `host_platform` in `python/servo/util.py`
- The `windows_gnu` bootstrapper in `python/servo/bootstrap.py`

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

<!-- Either: -->
- [ ] There are tests for these changes OR
- [x] These changes do not require tests because they remove unused code

<!-- 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. -->

Source-Repo: https://github.com/servo/servo
Source-Revision: 7ae9c96467b1a80f104aa5346c9fd11522490541

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 8e1b943fe6b0dc1bed06d58fcb3aa6d67d51271a
2017-04-14 21:56:42 -05:00
Josh Matthews
d1b78f3864 servo: Merge #16327 - Double number of WPT processes for Linux builders (from servo:jdm-patch-3); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: 10f51165c419a6f07b284ac3a867b60b1ed2de92

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : b41cfcb48d7bf1a562ac844d398c1b2627522ee7
2017-04-10 04:40:18 -05:00
Josh Matthews
f5ddcf5148 servo: Merge #16176 - Halve number of processes for test runs (from servo:jdm-patch-1); r=mbrubeck
Let's see if this makes the intermittent failure situation improve!

Source-Repo: https://github.com/servo/servo
Source-Revision: 3345b83fb370536a354ce82bb3493576f873d822

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 28e701d2b61b6e40a11cf781d2f5e105e069076a
2017-03-29 09:54:12 -05:00
Shing Lyu
fa0332b2b2 servo: Merge #15847 - Remove link to servo from treeherder job detail to reduce noise (from shinglyu:treeherder-cleanup); r=Wafflespeanut
<!-- Please describe your changes on the following line: -->
(This PR was original created by wlach in the deprecated servo-perf repo: https://github.com/shinglyu/servo-perf/pull/27)

Quoting his original message:
> The servo repository is already linked to from the revision list, there is no need for each job to link to it as well.
>This came up in: https://bugzilla.mozilla.org/show_bug.cgi?id=1342296

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

<!-- Either: -->
- [ ] There are tests for these changes OR
- [x] These changes do not require tests because need full treeherder setup to test

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

Source-Repo: https://github.com/servo/servo
Source-Revision: d3fa0a3dd61273b8216a1c6f1312ba418dc52c85

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 211520ad71024dced3a1f589c8418f2a0ff5ca29
2017-03-14 04:08:49 -07:00
Simon Sapin
c62b15357a servo: Merge #15619 - Buildbot steps: move geckolib from mac-rel-css to mac-rel-wpt2 (from servo:hot-potato); r=Manishearth
mac-rel-css is currently the job that takes the longest, and its geckolib step is independent from other jobs. Hopefully, this should reduce the overall CI cycle time.

This change was suggested by @mbrubeck.

Source-Repo: https://github.com/servo/servo
Source-Revision: 965c957b7c782ab0e6f946be02b6a7c1894a2236

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 704efbc5c32519ddd78174b68bb322646641ccd6
2017-02-17 12:28:49 -08:00
Simon Sapin
59acba3570 servo: Merge #15564 - Disable LLVM assertions by default, on supported platforms (from servo:no-gods-no-masters-no-assertions); r=Ms2ger
<!-- Please describe your changes on the following line: -->

https://github.com/servo/servo/pull/15559#issuecomment-280003926

> With an empty incremental compilation cache (or, presumably, with incremental compilation disabled), LLVM assertions add 16% to the compilation time in debug mode, 53% (!) in release mode.

---
<!-- 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 #15548 (github issue number if applicable).

<!-- Either: -->
- [ ] There are tests for these changes OR
- [ ] These changes do not require tests because _____

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

Source-Repo: https://github.com/servo/servo
Source-Revision: 1afae52c47e754c6573f4a8b72fcc2e6994d253f

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 7cbc302040099b6b6d0b09d6322b618b26ba61ac
2017-02-17 02:04:44 -08:00
Shing Lyu
7a83e02c27 servo: Merge #15067 - Added async performance test (from shinglyu:stylo-perf-async); r=Manishearth
<!-- Please describe your changes on the following line: -->
Add a new way to test arbitrary timing from JavaScript (only for Gecko). This is for Stylo testing.

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

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

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

Source-Repo: https://github.com/servo/servo
Source-Revision: e9933f36b771e9aad24b7abcac0ae81b49539d35

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 302e5278f435e9dc896d98012769fb1528bab571
2017-02-07 18:59:03 -08:00
Aneesh Agrawal
84b6763a98 servo: Merge #15284 - Remove unused builders (from aneeshusa:remove-unused-windows-builders); r=larsbergstrom
These have been superseded by the windows-gnu and windows-msvc versions.
Removing them allows freeing up disk space on the Windows builders.

r? @larsbergstrom

<!-- 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: -->
- [ ] `./mach build -d` does not report any errors
- [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
- [ ] These changes do not require tests because _____

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

Source-Repo: https://github.com/servo/servo
Source-Revision: 9cdf78d53d0a101d99e911088a00c677476f5bf1
2017-01-30 07:25:28 -08:00
UK992
e730825162 servo: Merge #15243 - Upload MSVC nightlies via MSYS environment (from UK992:windows-builder); r=larsbergstrom
Follow-up to https://github.com/servo/saltfs/pull/572

r? @larsbergstrom

Source-Repo: https://github.com/servo/servo
Source-Revision: bd72da5f02f2e2fc7ff3bbdc9cb54917a635c388
2017-01-27 05:15:14 -08:00
Aneesh Agrawal
1f43cccad3 servo: Merge #15029 - Check all constellation files for panics (from aneeshusa:check-whole-constellation-for-panics); r=asajeffrey
Teaches the `etc/ci/check_no_panic.sh` script to handle directories,
so it can check all constellation files for panics.

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

r? @asajeffrey
There are currently 4 `unwrap()`s in `components/constellation/timer_scheduler.rs`; I'm not sure how you want to handle those.

---
<!-- 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 #14976 (github issue number if applicable).

<!-- Either: -->
- [ ] There are tests for these changes OR
- [x] These changes do not require tests because it adds more testing coverage

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

Source-Repo: https://github.com/servo/servo
Source-Revision: f9505c7fafcbabd24cfa613493ecacd3e29d273e
2017-01-20 12:10:32 -08:00
Aneesh Agrawal
4a4f05025d servo: Merge #15005 - Fix git author setting for brew upload (from aneeshusa:fix-git-author-setting-for-brew-upload); r=jdm
<!-- Please describe your changes on the following line: -->

The fix from #14935 wasn't quite right.

cc @paulrouget

---
<!-- 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 servo/saltfs#575 properly (github issue number if applicable).

<!-- Either: -->
- [ ] There are tests for these changes OR
- [x] These changes do not require tests because they should be tested by running the mac-nightly builder

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

Source-Repo: https://github.com/servo/servo
Source-Revision: dc93a72997aefaeb04cdc058b01fdd2eb14cef8f
2017-01-13 06:33:56 -08:00
Shing Lyu
83f364121f servo: Merge #14937 - Read firefox path from environment variable for performance test (from shinglyu:stylo-perf); r=Manishearth
<!-- Please describe your changes on the following line: -->
This is for Stylo performance testing (at least before we got Talos running)

r?@Manishearth

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

<!-- Either: -->
- [ ] There are tests for these changes OR
- [x] These changes do not require tests because independent from servo itself

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

Source-Repo: https://github.com/servo/servo
Source-Revision: da25e881459084395b3f8e5891d08de0645b5f0b
2017-01-11 23:14:48 -08:00
Paul Rouget
b252a1118f servo: Merge #14935 - Add git author (from paulrouget:gitAuthor); r=aneeshusa
fix https://github.com/servo/saltfs/issues/575

Source-Repo: https://github.com/servo/servo
Source-Revision: 124301cf484818a87ab0b3e0c4ef34645be66174
2017-01-09 23:43:12 -08:00
Paul Rouget
55fe4d2c1f servo: Merge #14403 - Fix brew formula update (from paulrouget:fixBrew); r=aneeshusa
Fix https://github.com/servo/saltfs/issues/535

I decided to merge update_brew within upload_nightly.

I hope this will fix the brew formula upadte.

Source-Repo: https://github.com/servo/servo
Source-Revision: 207f9a5d3bb59cfc20b4455531325a3eb5a5ccf3
2017-01-05 19:59:18 -08:00
Aneesh Agrawal
bb916ce698 servo: Merge #14670 - Rename Windows nightly builders for consistency (from aneeshusa:fix-windows-nightly-builder-names); r=larsbergstrom
<!-- Please describe your changes on the following line: -->

Fixup for #14651. r? @larsbergstrom

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

<!-- Either: -->
- [ ] There are tests for these changes OR
- [x] These changes do not require tests because these builders aren't used yet

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

Source-Repo: https://github.com/servo/servo
Source-Revision: 5573f7cea3cc24e76501a05ff94b59c870ce7b82
2016-12-22 10:10:08 -08:00
Lars Bergstrom
72cbd6e04c servo: Merge #14651 - Create windows-gnu and windows-msvc builds (from larsbergstrom:add_msvc); r=aneeshusa
r? @metajack @edunham

The idea here is that I'm adding `-gnu` and `-msvc` variants in advance of the buildbot changes (in https://github.com/servo/saltfs/pull/491). Once those land and are pushed out to the buildbot master, it'll pick up these changed files and then we can remove the unsuffixed `windows-dev` and `windows-nightly`.

Source-Repo: https://github.com/servo/servo
Source-Revision: 25f32c4513a9d7c3514c4079eef35b1cc5c6b286
2016-12-22 08:47:15 -08:00
Lars Bergstrom
58f494133d servo: Merge #14587 - Exempt __cxa_type_match as an allowed dynamic symbol (from larsbergstrom:android_exempt_addition); r=Ms2ger
<!-- Please describe your changes on the following line: -->
This symbol is present in the new LLVM C++ stdlib, which is loaded dynamically from a .so file during startup.

Fixes #14571

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

<!-- Either: -->
- [ ] There are tests for these changes OR
- [ ] These changes do not require tests because _____

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

Source-Repo: https://github.com/servo/servo
Source-Revision: 7c7dd0f965c53de4557aa8ad1762f2314b6036e8
2016-12-14 08:36:53 -08:00
William Lee
4269bf24d5 servo: Merge #13845 - Part of #13551 - Create packages under release/debug directories as appropriate (from birryree:package-under-target-profile-dirs); r=aneeshusa
r? @aneeshusa

This change implements fixes for #13551 for Linux and MacOS targets.

`/python/servo/package_commands.py` was modified so that:
- On MacOS, it creates all intermediate packaging directories like `dmg`, `brew`, and `brew-tmp` under `target/(release|debug)`, rather than in `target` directly.
- On MacOS, all packaging artifacts (`.dmg`, brew `.tar.gz`) are packaged under `target/(release|debug)`, rather than in `target` directly.
- On Linux, the resulting `tar.gz` Servo package is placed under `target/(release|debug)`, rather than in `target`.
- Also did some extra cleanup around path parsing in the MacOS packaging code, to use `os.path` methods rather than straight `'/'` parsing with `split` and `join` where it was applicable.

`/etc/ci/upload_nightly.sh` was modified to:
- Look for artifacts in `target/release` for `mac`, `macbrew`, and `linux` platforms, rather than just `target/`.

---

<!-- 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 #13551
- [x] These changes do not require tests because it is based on CI and packaging tools. They were manually tested for correctness.

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

…lease/debug as specified or detected. Modify macos packaging to create all packages under release/debug directory. Updated etc/ci/upload_nightly.sh to support uploading from either release/debug directory, depending on what was built

Source-Repo: https://github.com/servo/servo
Source-Revision: 4cb3404c09d0b6a5a19a2c842d2e8809fae31e87
2016-12-09 14:46:14 -08:00
Corey Farwell
fae587d847 servo: Merge #14499 - Add uncommitted lockfile change; fix check script. 🔒 (from frewsxcv:lockfile); r=jdm
Source-Repo: https://github.com/servo/servo
Source-Revision: 51a5a3402ced7a330c2a7d377dc4459792a28bee
2016-12-08 13:29:07 -08:00
Shing Lyu
da07781c74 servo: Merge #14147 - Added an option to allow submitting test-perf result to perfherder (from shinglyu:test-perf-submit); r=larsbergstrom,aneeshusa
<!-- Please describe your changes on the following line: -->

This patch enables us  to run `./mach test-perf --submit` in CI to submit the result to perfherder. r? @aneeshusa

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

<!-- Either: -->
- [ ] There are tests for these changes OR
- [x] These changes do not require tests because too many manual setup required to test it

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

Source-Repo: https://github.com/servo/servo
Source-Revision: 7d66bd710cee081155487ef36fe5b490e181c780
2016-11-30 19:11:16 -08:00
Shing Lyu
b9f3e6e330 servo: Merge #14194 - Use Selenium for Gecko performance test (from shinglyu:gecko-webdriver); r=larsbergstrom,aneeshusa,jgraham
<!-- Please describe your changes on the following line: -->
We run the `etc/ci/performance` test on Gecko for comparison, but the old add-on approach doesn't work anymore. I'm using selenium to drive Gecko instead. Also did some refactoring and fixed some nits I saw along the way.

r? @aneeshusa

---
<!-- 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 #14148  (github issue number if applicable).

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

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

Source-Repo: https://github.com/servo/servo
Source-Revision: 69f914b8b567424c85f9a947b453e7e9b0d4d243
2016-11-28 20:22:05 -08:00
Manish Goregaokar
cedec048be servo: Merge #14400 - Add a log of only intermittents (from Manishearth:filter-intermittents); r=KiChjang
r? @KiChjang

Source-Repo: https://github.com/servo/servo
Source-Revision: 015c7642618e5be3df06a8799a87ec152f7d46fc
2016-11-28 18:38:53 -08:00
Manish Goregaokar
62888fa987 servo: Merge #14331 - Add ./mach filter-intermittents for catching intermittents on CI (from Manishearth:filter-intermittents); r=larsbergstrom,jdm
cc @metajack

The plan here is to run this on the error summary of the logs after each WPT/CSS run, as `./mach filter-intermittents wpt-errorsummary.log --output filtered-errorsummary.log --auth /path/to/authfile`

The `filtered-errorsummary.log` file will be a buildbot artifact for this run, and can be used for updating test results.

We change WPT/CSS runs to not cause test failures on Buildbot; instead; the test failure will be caused by this job.

We should at some point add a separate highfive task which ccs the appropriate bugs and tracks consistent failures. (We can change mach filter-intermittents to output a second file of intermittents matched to bug numbers to make this easy)

A small issue with this is that this simple task might mask failures of the WPT harness itself. We have a separate test that tests if the test harness works though. (This test will fail if the log files it requires don't exist, perhaps that's enough to solve the problem)

r? @larsbergstrom

Source-Repo: https://github.com/servo/servo
Source-Revision: 4021d057c941f38ca9f9ef9bb03f91d1b54f01c0
2016-11-28 15:18:04 -08:00
Shing Lyu
f7e0070425 servo: Merge #13930 - Use headless rendering for performance test (from shinglyu:perf-llvmpipe); r=aneeshusa
<!-- Please describe your changes on the following line: -->

Properly set the software rendering environment variables and use `-z` to run the performance test in headless mode. Also changed some logging format to improve the readability and reduce log size.
---

<!-- 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 #13903 (github issue number if applicable).

<!-- Either: -->
- [ ] There are tests for these changes OR
- [x] These changes do not require tests because need manual test

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

Source-Repo: https://github.com/servo/servo
Source-Revision: f5a3d68513456b991313dfac19b94d630cc326be
2016-11-07 01:24:06 -06:00
Rohit Burra
42d578b558 servo: Merge #14025 - Add --with-debug-assertions flag for Mach (from iamrohit7:debug-assertions); r=Wafflespeanut
I tested out building a release with the flag and added a `debug_assert!(false)` in `fn main` and it panicked.
<!-- 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 #14009  (github issue number if applicable).

<!-- Either: -->
- [ ] There are tests for these changes OR
- [X] These changes do not require tests because they are manually tested

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

Source-Repo: https://github.com/servo/servo
Source-Revision: dbce416ad436b9a3a007181fbd5d0f158cd7d9e4
2016-11-05 22:57:44 -05:00
Jake Goldsborough
4fe7c0a9ad servo: Merge #14058 - moving datetimestamping responsibilities from mach package (from ducks:make-upload-nightly-put-datetimes-12128); r=Wafflespeanut
to CI upload, swaps semicolons for dashes

<!-- Please describe your changes on the following line: -->
This fixes #12128 by moving the datetimestamping responsibility from the python packaging script to the CI build shell script.

---
<!-- 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 #12128 (github issue number if applicable).

<!-- Either: -->
- [ ] There are tests for these changes OR
- [X] These changes do not require tests because they are part of CI build

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

Source-Repo: https://github.com/servo/servo
Source-Revision: 4c5d84d81a45a2f85ceca88ca69374b464722cd1
2016-11-04 04:04:34 -05:00
6br
0d518cda36 servo: Merge #10942 - Rename check_no_unwrap.sh to check_no_panic.sh (from 6br:rename_check_no_panic); r=aneeshusa
Hello, I fixed #10930.

Source-Repo: https://github.com/servo/servo
Source-Revision: 3ae0a3335dbaf3f67c775a1853941ed538d97563

--HG--
rename : servo/etc/ci/check_no_unwrap.sh => servo/etc/ci/check_no_panic.sh
2016-10-29 00:22:56 -05:00
Aneesh Agrawal
991d99e061 servo: Merge #13968 - Remove steps for unused linux-dev-yaml test builder (from aneeshusa:remove-steps-for-yaml-test-builders); r=larsbergstrom
<!-- Please describe your changes on the following line: -->

r? @larsbergstrom

---
<!-- 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
- [ ] `./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 that is #13838

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

These steps were used while testing the transition to dynamic steps.
Now that dynamic steps are working properly, this builder has been
decommissioned, and its steps are no longer needed.

Source-Repo: https://github.com/servo/servo
Source-Revision: e4fcc066d1248dc072026ba1dd887ffca5049c53
2016-10-28 18:59:16 -05:00
Mátyás Mustoha
5d3c509519 servo: Merge #13946 - Update etc/ci/check_dynamic_symbols.py (from mmatyas:android_dyncheck); r=larsbergstrom
Update `etc/ci/check_dynamic_symbols.py` to work after [the latest changes](https://github.com/servo/servo/pull/13945) in the Android build system.

Part of #13154.

Source-Repo: https://github.com/servo/servo
Source-Revision: b661f0691611c8c568840b75ac646af960aa683d
2016-10-28 14:33:13 -05:00
Manish Goregaokar
016ff30ae6 servo: Merge #13720 - Add release test-stylo to buildbot steps, https://github.com/servo/saltfs/pull/508#issuecomment-253203920 (from Manishearth:resync-yml); r=aneeshusa
r? @aneeshusa

Source-Repo: https://github.com/servo/servo
Source-Revision: 4034bd68c2b2b9b899ecfb6e0d2b3ba17109c5ae
2016-10-12 17:03:48 -05:00
Aneesh Agrawal
4d0bfee5fc servo: Merge #13611 - Sync Buildbot steps config from saltfs (from aneeshusa:migrate-steps-from-saltfs); r=Ms2ger
<!-- 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
- [ ] `./mach test-tidy` does not report any errors
- [x] These changes are part of https://github.com/servo/saltfs/issues/316

<!-- Either: -->
- [ ] There are tests for these changes OR
- [x] These changes do not require tests because they just copy the steps configuration

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

Now that our Buildbot configuration is successfully able to read the
steps configuration from the main servo repo and run builds, sync the
steps in the servo tree to match the latest steps.yml from the saltfs
repo.

Source-Repo: https://github.com/servo/servo
Source-Revision: ff04558ce26203cc3eb63edc9a15a6e6622b814a
2016-10-06 15:15:00 -05:00
Alan Jeffrey
208cea2587 servo: Merge #13472 - Don't log in the middle of mutating a reentrant lock (from asajeffrey:util-remutex-dont-log-while-mutating-lock); r=jdm
<!-- Please describe your changes on the following line: -->

Moved assertion that we are the lock owner to after the lock release. The problem is that Servo uses a reentrant lock for logging, so logging in the middle of mutating the lock is A Bad Idea.

While I was at it, I tidied up the reentrant lock code.

cc @jdm

---
<!-- 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 #13463.
- [X] These changes do not require tests because they fix an existing intermittent.

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

Source-Repo: https://github.com/servo/servo
Source-Revision: 318b23ed0047cc39625ca2f33a55d647b5886019
2016-10-04 16:01:40 -05:00
Aneesh Agrawal
fc6b0f7463 servo: Merge #13507 - Don't leak GitHub tokens when pushing (from aneeshusa:avoid-leaking-github-tokens); r=SimonSapin
<!-- 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: -->
- [ ] `./mach build -d` does not report any errors
- [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 they just remove output/were lightly tested by hand

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

If git is unable to resolve the repo address (which includes the token),
it will print a message to stderr with the path to the repo, thus
leaking the token. Avoid doing this.

Source-Repo: https://github.com/servo/servo
Source-Revision: d067f469d07ced138f9a63d1bdfc83fbc201a62f
2016-10-04 08:59:11 -05:00