Граф коммитов

20 Коммитов

Автор SHA1 Сообщение Дата
Simon Sapin 67aa4b3be9 servo: Merge #18942 - Bootstrap from more permanent URLs (from servo:static.rlo); r=jdm,mbrubeck
The `rust-lang-ci` S3 bucket is ephemeral. `static-rust-lang-org.s3.amazonaws.com` is not going away soon, but using `static.rust-lang.org` when possible keeps things working if it ever does.

https://internals.rust-lang.org/t/updates-on-rusts-ci-uploads/6062
https://internals.rust-lang.org/t/public-stable-rust-services/6072

We’ll still need to find a solution for "alt" rustc builds. In the meantime, this is a step.

Source-Repo: https://github.com/servo/servo
Source-Revision: 041bd626ace013f93fa7fe101c70f36543fc9b0d

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : af6533ade663a50e140f1630aef427666617f3ba
2017-10-20 07:44:26 -05:00
Josh Matthews 8ecfef6623 servo: Merge #18961 - Update mozlog dependency (from servo:jdm-patch-5); r=glennw
wptrunner repends on mozlog 3.5, but we only require 3.3. Somehow some of the builders have 3.5 installed, but this is causing lots of problems for us.

Source-Repo: https://github.com/servo/servo
Source-Revision: 21926e0008d2ae67ad21b73f080eadc2ef82d958

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : ffa03691ef81f210ab5d11a7dc4bbf1392cc7a13
2017-10-19 20:52:19 -05:00
Simon Sapin f2efd3cd15 servo: Merge #18552 - Update osmesa-src to support building with mach (from servo:machless); r=nox
E.g. `cargo +nightly build -p servo` at the repo’s top-level

Source-Repo: https://github.com/servo/servo
Source-Revision: 0ed54b039a932f8293f8bec4ac8f6b7a6f54be5c

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : b77884d3e8feaea5ed34632f5a206731e4dffd6c
2017-09-18 11:46:45 -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
Aneesh Agrawal 7867bd9341 servo: Merge #14974 - Use Salt for mach bootstrap (from aneeshusa:add-mach-bootstrap); r=metajack
<!-- Please describe your changes on the following line: -->

This is currently WIP, but allows Salt for `mach bootstrap`. Not looking for review yet, just posting for visibility. You can run `./mach bootstrap` and Salt will run, letting you know what changes it would make for bootstrapping (doesn't actually run yet though).

Currently, this reads from saltfs using gitfs, meaning it always tracks the master branch. (Note that this is blocked on https://github.com/servo/saltfs/pull/577 landing; in the meantime, I've included a small workaround in this PR to pull from my updated saltfs branch, which will need to be removed.) In the future, the relevant Salt code may be merged in tree as part of Docker support for TC, and the bootstrapper should be updated to read from in tree.

Also, our Windows machines have not been Salted, so the existing Windows bootstrappers are retained.

TODO:
- [x] Hook into existing bootstrapping code less hackily
- [x] Actually bootstrap instead of always using `test=True` mode (includes sudo)
- [x] Default to interactive mode (test first, then ask), with a force flag
- [x] Don't require running from the repository root directory
- [x] Make it easy to add support for other distros

---
<!-- 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 should be verified manually

<!-- 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: 1f76aa6ef7ec7db0a0c40223874a72e8f4059deb
2017-01-19 20:58:19 -08:00
UK992 04302a98c4 servo: Merge #14715 - Tidy: Check Cargo.lock for packages with same version and different sources (from UK992:tidy-check-lock); r=SimonSapin
<!-- Please describe your changes on the following line: -->
r? @Wafflespeanut

cc @SimonSapin

---
<!-- 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 #14695

<!-- Either: -->
- [X] There are tests for these changes
<!-- 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: 37a5e29147f0dc489888377d6f7bb53282dc04f9
2016-12-26 08:57:04 -08:00
William Lee 3ab1743159 servo: Merge #14051 - Adding linting checks for buildbot_steps.yml (from birryree:tidy-check-buildbot-steps); r=aneeshusa
This pull request adds some tidy checks around YAML files, and specifically `buildbot_steps.yml`.

Tidy checks added:

* YAML files are checked for well-formedness/parse-ability
* Whether a YAML file has duplicate keys
* Whether a `buildbot_steps.yml` file contains only mappings to list-of-strings.

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

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

…ing checking for correct mappings and duplicate YAML keys. Added unit tests to test_tidy.py.

Source-Repo: https://github.com/servo/servo
Source-Revision: 21ad1c210997daba82ec49e1572c7b0634b6f337
2016-12-08 17:39:44 -08:00
Josh Matthews 604dcccbec servo: Merge #13562 - Move mako out of wptrunner required packages (from servo:jdm-patch-5); r=jgraham
There was a review comment about this in https://github.com/servo/servo/pull/13382#issuecomment-249453104 that was never addressed.

Source-Repo: https://github.com/servo/servo
Source-Revision: c10de40e4ea4430037ac9156cc2b5d31f92a7cd4
2016-10-03 15:09:23 -05:00
Emilio Cobos Álvarez 9287c48599 servo: Merge #13171 - Revert "Remove mako.zip" (from emilio:mako-is-back); r=SimonSapin
<!-- 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 95e3f8333a116f9bd62fb071d08fcef269697804.

Source-Repo: https://github.com/servo/servo
Source-Revision: fe9d9096ec3e78e2d5d53d32f181dc519512a40a
2016-09-03 23:56:55 -05:00
crypto-universe d905123881 servo: Merge #13097 - Mako task (from crypto-universe:mako_task); r=SimonSapin
<!-- Please describe your changes on the following line: -->
Remove mako zip

---
<!-- 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 #12958 (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. -->

r? @SimonSapin

Source-Repo: https://github.com/servo/servo
Source-Revision: e4362356d29ab5b18cb6316a3a510dfa31f9ba7c
2016-09-01 16:47:10 -05:00
UK992 05e12d5592 servo: Merge #12781 - Improve tidy's license validation logic (from UK992:tidycheck-rebased); r=Wafflespeanut
Rebased and fixed https://github.com/servo/servo/pull/10721, which is inactive for months.
Fixes https://github.com/servo/servo/issues/10716

r? @larsbergstrom or @edunham

Source-Repo: https://github.com/servo/servo
Source-Revision: 8419f96dc0cb79c83922b62166390f6688f2aae0
2016-08-14 09:17:34 -05:00
Jeremy Chen 0a18da0afe servo: Merge #12510 - Upgrade mozlog package from 3.0 to 3.3 (from chenpighead:update-mozlog); r=metajack
<!-- Please describe your changes on the following line: -->
Update mozlog to 3.3 so we can have correct reftest screenshots displayed with --log-html.
The original mozlog update bugs are listed as follows:
https://bugzilla.mozilla.org/show_bug.cgi?id=1287019
https://bugzilla.mozilla.org/show_bug.cgi?id=1287480

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

<!-- Either: -->
- [ ] There are tests for these changes OR
- [X] These changes do not require tests because this is just a PyPI package version bumping

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

Update mozlog to 3.3.

Source-Repo: https://github.com/servo/servo
Source-Revision: 73cfab0016fd761da24d6280154fda6561b417fe
2016-07-20 07:21:26 -05:00
Jean SIMARD da8a7b9083 servo: Merge #12480 - Build failing because of unspecified dependency for html5lib (from woshilapin:fix-12480); r=larsbergstrom
Trying to simply build `servo`, I've reached a very early error.  I cloned the `servo` repo, installed the dependencies specified on the [README](https://github.com/servo/servo#prerequisites).  I'm running on a Debian Jessie [`Linux my machine 3.16.0-4-amd64 #1 SMP Debian 3.16.7-ckt25-2+deb8u3 (2016-07-02) x86_64 GNU/Linux`].

Then I run.
```
./mach build --dev
```

I only get the following message.
```
Pip failed to execute properly:
```

Looking in already existing issues, the only one I could find is #12062 which is about missing space on hard drive but this doesn't seem to be my problem.

I've looked more into the problem and found that pip was having problem.  Here is the error message.

```
  Downloading from URL 99e69cdcef051bf0cc5526d790c445/html5lib-0.999999999.tar.gz#md5=8578e4e3a341436cb9743a9e4a299239 (from https://pypi.python.org/simple/html5lib/)
  Running setup.py (path:/tmp/pip-build-mFVe16/html5lib/setup.py) egg_info for package html5lib
    html5lib requires setuptools version 18.5 or above; please upgrade before installing (you have 5.5.1)
    Complete output from command python setup.py egg_info:

----------------------------------------
Cleaning up...
Command python setup.py egg_info failed with error code 1 in /tmp/pip-build-mFVe16/html5lib
Exception information:
Traceback (most recent call last):
  File "/home/woshilapin/Projects/woshilapin/servo/python/_virtualenv/local/lib/python2.7/site-packages/pip/basecommand.py", line 122, in main
    status = self.run(options, args)
  File "/home/woshilapin/Projects/woshilapin/servo/python/_virtualenv/local/lib/python2.7/site-packages/pip/commands/install.py", line 290, in run
    requirement_set.prepare_files(finder, force_root_egg_info=self.bundle, bundle=self.bundle)
  File "/home/woshilapin/Projects/woshilapin/servo/python/_virtualenv/local/lib/python2.7/site-packages/pip/req.py", line 1230, in prepare_files
    req_to_install.run_egg_info()
  File "/home/woshilapin/Projects/woshilapin/servo/python/_virtualenv/local/lib/python2.7/site-packages/pip/req.py", line 326, in run_egg_info
    command_desc='python setup.py egg_info')
  File "/home/woshilapin/Projects/woshilapin/servo/python/_virtualenv/local/lib/python2.7/site-packages/pip/util.py", line 716, in call_subprocess
    % (command_desc, proc.returncode, cwd))
InstallationError: Command python setup.py egg_info failed with error code 1 in /tmp/pip-build-mFVe16/html5lib
```

I found that adding the following line in the file `python/requirements.txt` seems to solve the problem (I've build `servo` without errors and `./mach test-tidy` pass too).
```
setuptools >= 18.5
```

Since I'm very new to `servo`, I didn't propose a Pull Request because I'm not sure this is right way of fixing it or maybe I'm doing something wrong.  But I'd be happy to create the Pull Request if that's a valuable solution.

Source-Repo: https://github.com/servo/servo
Source-Revision: 0fa10df64ae928bccb05ea7c182eeffbed3af8a8
2016-07-17 11:40:19 -07:00
Corey Farwell 5ba2811008 servo: Merge #10976 - Upgrade mach to 0.6; stop vendoring mach (from frewsxcv:novendor-mach); r=mbrubeck
When I originally rewrote Servo's mach bootstrapping (using virtualenv
w/ requirements.txt in #7103), I didn't specify mach as a requirement
because a new version hadn't been published in a while. Now that 0.6
is out, I asked the mach maintainers to publish a new version on PyPI,
so now we can fetch it like the other Python dependencies.

Fixes https://github.com/servo/servo/issues/10728.

Source-Repo: https://github.com/servo/servo
Source-Revision: e39ed932cb8c67eac98d44d00ed5bf642c026846
2016-05-02 18:07:25 -07:00
askeing 74c4289c9f servo: Merge #10653 - Cleanup tidy for external deps (from askeing:cleanup_tidy_for_external_deps); r=edunham
fix #10639

Source-Repo: https://github.com/servo/servo
Source-Revision: 4d80e0634ed58580a7d30fc7f57e6bdf4aa4e19d
2016-04-19 01:52:01 +05:01
askeing 653eddd3d8 servo: Merge #10590 - Package tidy (from edunham:package-tidy); r=larsbergstrom
This fixes https://github.com/servo/servo/issues/861.

@askeing, I've copied your work from https://github.com/askeing/servo_tidy and attributed the commit to you. My commit in this PR is Git housekeeping to preserve `tidy`'s history. If you'd like to make additional changes, I've given you and @shinglyu push access to my fork of Servo. Apologies if this is already familiar, but the workflow for pushing to my branch is:

```
$ git remote add edunham git@github.com:edunham/servo.git
$ git checkout -b package-tidy
$ git pull edunham package-tidy
$ git push edunham package-tidy
```

Once this lands, I'll look at how to publish it to PyPI and automate that process.

Please don't merge this yet; we still need to discuss how the change should work around https://github.com/servo/servo/blob/master/python/servo/testing_commands.py#L33 , as I've yet to figure out how to get the egg to actually expose its tests.

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

--HG--
rename : servo/python/tidy_self_test/__init__.py => servo/python/tidy/servo_tidy/__init__.py
rename : servo/python/licenseck.py => servo/python/tidy/servo_tidy/licenseck.py
rename : servo/python/tidy.py => servo/python/tidy/servo_tidy/tidy.py
rename : servo/python/servo/__init__.py => servo/python/tidy/servo_tidy_tests/__init__.py
rename : servo/python/tidy_self_test/incorrect_license.rs => servo/python/tidy/servo_tidy_tests/incorrect_license.rs
rename : servo/python/tidy_self_test/long_line.rs => servo/python/tidy/servo_tidy_tests/long_line.rs
rename : servo/python/tidy_self_test/rust_tidy.rs => servo/python/tidy/servo_tidy_tests/rust_tidy.rs
rename : servo/python/tidy_self_test/spec.webidl => servo/python/tidy/servo_tidy_tests/spec.webidl
rename : servo/python/tidy_self_test/speclink.rs => servo/python/tidy/servo_tidy_tests/speclink.rs
rename : servo/python/tidy_self_test/test.toml => servo/python/tidy/servo_tidy_tests/test.toml
rename : servo/python/tidy_self_test/tidy_self_test.py => servo/python/tidy/servo_tidy_tests/test_tidy.py
rename : servo/python/tidy_self_test/tidy_self_test.py => servo/python/tidy/servo_tidy_tests/tidy_self_test.py
rename : servo/python/tidy_self_test/whatwg_link.rs => servo/python/tidy/servo_tidy_tests/whatwg_link.rs
rename : servo/python/tidy_self_test/wrong_space.rs => servo/python/tidy/servo_tidy_tests/wrong_space.rs
2016-04-15 22:51:16 +05:01
Shing Lyu e405dcb806 servo: Merge #9459 - Add mach test-webidl command (from shinglyu:testwebidl); r=Wafflespeanut
I updated the `WebIDL.py` from latest mozilla-central. And add a `./mach test-webidl` command. For #9397

Source-Repo: https://github.com/servo/servo
Source-Revision: 0ada7f9c8eda9879b5536cea3266c94214f9ce9b
2016-01-30 20:52:53 +05:01
Corey Farwell 89cf6e9dfe servo: Merge #7117 - Reenable "Use one Python virtual environment for all mach commands" (from frewsxcv:python-venv); r=jdm
Address the issues brought up by https://github.com/servo/servo/pull/7103

The revert requires an upgrade to wptrunner (for the mozlog 3.0 compatibility) because the latest wptrunner depends on [this](https://github.com/w3c/wpt-tools/pull/27))

/cc @Ms2ger @metajack

Source-Repo: https://github.com/servo/servo
Source-Revision: 4e6bbe227299b3b8a08cba7e613952806ada4402
2015-09-02 08:44:27 -06:00
Ms2ger a173d30242 servo: Revert "Auto merge of #7103 - frewsxcv:python-venv, r=metajack" for breaking web-platform-tests.
This reverts commit c315404db80c92a695531b0aa4bcf61c125a3bff, reversing
changes made to b00583bd4e7169a6b952633df718268904f2bd0c.

Source-Repo: https://github.com/servo/servo
Source-Revision: 47d6d958f58f5011742a18abcdd5a76bf4390966
2015-08-09 11:20:40 +02:00
Corey Farwell 5efbfa841e servo: Merge #7103 - Use one Python virtual environment for all mach commands (from frewsxcv:python-venv); r=metajack
*See individual commits for more information*

Source-Repo: https://github.com/servo/servo
Source-Revision: c315404db80c92a695531b0aa4bcf61c125a3bff
2015-08-08 19:42:14 -06:00