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

30 Коммитов

Автор SHA1 Сообщение Дата
Josh Matthews 654f27fdaf servo: Merge #19832 - Remove clean-cache from appveyor (from servo:jdm-patch-2); r=jdm
This fixes #19831.

Source-Repo: https://github.com/servo/servo
Source-Revision: 04aa53a94402919711ef86362f4c4d91a9ae6070

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 87db6a82399c3e330c0ab0c8a83501ff375610b8
2018-01-24 11:25:23 -06:00
tigercosmos 864be907a6 servo: Merge #19713 - auto clean cache in build bot (from tigercosmos:r1); r=jdm
<!-- Please describe your changes on the following line: -->
auto clean cache in build bot

once this merged, servo/saltfs#321 should be closed

---
<!-- 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 #19712  (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: d11886e9a12c2ef7262e34de3de7595005a66080

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 7f60a4311d90d6dfc950da5f6bda80d671a23d45
2018-01-18 08:09:59 -06:00
Simon Sapin 53ce66c194 servo: Merge #19683 - Upgrade to rustc 1.24.0-nightly (0a3761e63 2018-01-03) (from servo:rustup); r=jdm
Fixes #19635
Fixes #19637
Fixes #19735
Fixes #19519

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

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 850bb03bf38848f152cb635ff09b96d5cbf1cfa1
2018-01-10 14:00:32 -06:00
Simon Sapin 6102d09277 servo: Merge #19395 - Use rustup.rs instead of custom bootstrap (from servo:rustup.rs); r=jdm
Use rustup.rs instead of custom bootstrap

Fixes #11361, closes #18874, fixes #19365.

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

--HG--
rename : servo/rust-stable-version => servo/geckolib-rust-toolchain
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : c6a5c3079e3c2b9894e937024355e7586adef91e
2018-01-10 12:00:59 -06:00
Aneesh Agrawal 8044f8fd4e servo: Merge #19720 - Update buildbot_steps lint to handle env variables (from aneeshusa:support-env-vars-in-buildbot-steps); r=jdm
https://github.com/servo/saltfs/pull/687 added support
for specifying environment variables in `buildbot_steps.yml`.
Update the servo-tidy buildbot_steps.yml linter to reflect this.

Use the voluptuous Python library (BSD 3-clause license) for validation
in lieu of a much larger hand-written implementation.

Extracted out of #17171. Helps with servo/saltfs#770.

<!-- 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: -->
- [x] There are tests for these changes OR
- [ ] These changes do not require tests because they change the tests

Source-Repo: https://github.com/servo/servo
Source-Revision: 6a6dda526961b7bb7b856e8310ffc165d8bd39aa

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : ebdbefbc7cb6f397a0630f417c9c03e003cfc9ab
2018-01-09 11:40:27 -06:00
tigercosmos 7be35fc71a servo: Merge #19612 - deny warnings (from tigercosmos:o1); r=jdm
<!-- Please describe your changes on the following line: -->
deny warnings
related to #19573

---
<!-- 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 #19572 (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: 2eb1512c22e7d79a4c6af70af7aec53f4b18cac2

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : dbac199ced6f23c0e3c360d9c814585837e1389d
2017-12-21 13:57:04 -06:00
Simon Sapin 118c6485b6 servo: Merge #18325 - Switch back to pinning Rust by Nightly date instead of commit hash… (from servo:rustup-toolchain); r=nox
… this time using a `rust-toolchain` file compatible with rustup: https://github.com/rust-lang-nursery/rustup.rs/#the-toolchain-file

And upgrade to rustc 1.21.0-nightly (c11f689d2 2017-08-29)

----

Now if both `system-rust` and `system-cargo` are set to `true` in `.servobuild`’s `[tools]` section, and the corresponding `rustc` and `cargo` binaries are in fact rustup’s wrappers, then rustup will use the correct version based on `rust-toolchain`.

CC https://github.com/servo/servo/issues/11361

Unlike https://github.com/servo/servo/pull/17927, this does not make mach use rustup directly. That should wait until https://github.com/rust-lang-nursery/rustup.rs/issues/1099 is fixed.

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

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : e3d41159bc4670ea990630e5342fe9b663a79fe5
2017-08-31 07:47:34 -05:00
Simon Sapin 1d9a118a36 servo: Merge #17780 - Update to cargo 0.21.0-nightly (eb6cf012a 2017-07-02) (from servo:cargoup); r=nox,SimonSapin
Cargo binaries are now produced on Rust’s CI, not Cargo’s. Remove cargo-commit-hash and find Cargo based on rust-commit-hash.

Unfortunately, Cargo binaries are not available for every Cargo PR anymore: https://github.com/rust-lang/cargo/pull/4123#issuecomment-316201869

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

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 5adb79e9d2a0446949f4ca8211496d96b41e648f
2017-07-18 15:57:07 -07:00
Aneesh Agrawal 28754cdbf7 servo: Merge #16490 - Remove windows gnu part 2 (from aneeshusa:remove-windows-gnu-part-2); r=metajack
<!-- Please describe your changes on the following line: -->

This is a follow-up to #16468.

---
<!-- 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 we no longer support MinGW/MSYS

<!-- 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: 485a4de729e196d1baca2ffe01518bbd4b0d1afa

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 0b7ead6826a132a8b393c3770fabb9243808a294
2017-04-16 21:38:05 -05:00
Anthony Ramine 38f941302b servo: Merge #15559 - Allow disabling LLVM assertions in rustc (fixes #15548) (from servo:rustup); r=SimonSapin
Source-Repo: https://github.com/servo/servo
Source-Revision: 4f10a0f2e1ae545649957cc7e305c8cb81312759

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 5a783721d549881760dfac0fe76eee89b88eea70
2017-02-15 06:46:22 -08:00
UK992 65d5697008 servo: Merge #15393 - Windows: Instructions update, removed freetype and silent some warning (from UK992:win32); r=metajack
i made some changes to Windows instruction, more unified.
Also removed freetype dependencies on Windows, by forcing to build harfbuzz from source, which is also dependent on freetype.

cc @larsbergstrom @metajack

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

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 31c8180d9cdb7888b32c61389b6940b9364b4aec
2017-02-05 17:33:23 -08:00
UK992 251f5719c3 servo: Merge #14850 - Appveyor: Use ccache on Windows GNU builds (from UK992:appveyor-ccache); r=larsbergstrom
r? @larsbergstrom

Locally tested:

First run: (Build time: 26:27)
```
cache directory                     C:/github/servo/.servo/.ccache
primary config                      C:/github/servo/.servo/.ccache/ccache.conf
secondary config      (readonly)    C:/building/msys64/mingw64/etc/ccache.conf
cache hit (direct)                     0
cache hit (preprocessed)               0
cache miss                           953
called for link                        5
called for preprocessing               9
compile failed                         6
preprocessor error                    30
unsupported source language            1
autoconf compile/link                 43
no input file                          6
files in cache                      2523
cache size                         443.0 MB
max cache size                       5.0 GB
```

Second run: (Build time: 15:30)

```
cache directory                     C:/github/servo/.servo/.ccache
primary config                      C:/github/servo/.servo/.ccache/ccache.conf
secondary config      (readonly)    C:/building/msys64/mingw64/etc/ccache.conf
cache hit (direct)                   922
cache hit (preprocessed)              31
cache miss                           953
called for link                       10
called for preprocessing              18
compile failed                        12
preprocessor error                    60
unsupported source language            2
autoconf compile/link                 86
no input file                         12
files in cache                      2523
cache size                         443.0 MB
max cache size                       5.0 GB

```

Source-Repo: https://github.com/servo/servo
Source-Revision: 6d4ccab2b71c8eedcf05ed5402195538d626f8c8
2017-01-06 09:05:34 -08:00
mati865 eb3464f50e servo: Merge #14346 - Use MSVC toolchain if PLATFORM is defined (from mati865:master); r=UK992,larsberg
<!-- Please describe your changes on the following line: -->
`VSInstallDir` exists only when Visual Studio is installed.
`VS140COMNTOOLS` is defined by installing either Visual Studio or [Visual C++ Build Tools](http://landinghub.visualstudio.com/visual-cpp-build-tools)

It will allow to build MSVC based Servo without having to install whole Visual Studio (few GiB).

EDIT: Another (maybe cleaner) solution would be reverting 63ec96a57d

---
<!-- 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 `VS140COMNTOOLS` variable is already used in [mach.bat](https://github.com/servo/servo/blob/master/mach.bat)

<!-- 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: 7f2da7483b2d0c71a227fb8707eea00b0602d977
2016-12-28 07:37:45 -08:00
Simon Sapin c2fe6c7932 servo: Merge #14397 - Upgrade to cargo 0.16.0-nightly (built 2016-12-06) (from servo:cargoup); 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
- [ ] `./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: e2d956eb62f35e6646501b058296da33ca96fe00
2016-12-06 15:42:30 -08:00
Jack Moffitt a6844a78e7 servo: Merge #14039 - Fix test-wpt and test-css for Windows (from metajack:windows-wpt); r=jgraham
<!-- Please describe your changes on the following line: -->
In addition to minor changes for Windows, this forces Windows Python to
be used for all Windows builds (instead of using Windows Python only for
pc-windows-msvc builds).

---
<!-- 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 testing the tests is too meta for me

<!-- 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: 17bf6aed21cb966c52382e7cef23d2bd66144874
2016-11-16 13:41:27 -06:00
UK992 b8261dfe67 servo: Merge #14193 - Various cleanup (from UK992:win-cleanup); r=vvuk
<!-- Please describe your changes on the following line: -->
Reduces msi file size from 102 MB to 94 MB and installation size from 394 MB to 334 MB.

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

Source-Repo: https://github.com/servo/servo
Source-Revision: b7eb36fa84e6c6c77727ea2cd02c57f6750dc7af
2016-11-14 12:12:29 -06:00
Lars Bergstrom 442a46ad1a servo: Merge #14143 - Remove the mingw git to fix AppVeyor builds (from larsbergstrom:git_fix_appveyor); r=notriddle
<!-- Please describe your changes on the following line: -->
Fixes #13939. This is a test, based on @UK992's comment here:
https://github.com/servo/servo/issues/13939#issuecomment-259252852

Please wait for the AppVeyor build to succeed before r+ :-)

---
<!-- 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: 3b298564e126992f8301980b7213495416da60d1
2016-11-09 02:15:44 -06:00
UK992 7946838f31 servo: Merge #13383 - Appveyor and Travis fix (from UK992:ci); r=jdm
Fixes https://github.com/servo/servo/issues/13340

Source-Repo: https://github.com/servo/servo
Source-Revision: 4cb4e38d382a02d5cabd2c9a0f073780bd8a2a1f
2016-09-23 11:11:13 -05:00
UK992 fc0990e5cc servo: Merge #12916 - Create `mach bootstrap` based on Mozilla's mozboot bootstrapper (from UK992:msvc-dependencies); r=larsbergstrom,wafflespeanut
Fixes https://github.com/servo/servo/issues/12914
I've made this few weeks ago, its an example how could everything looks like.
It downloads and setup all needed dependencies for MSVC.
It's has version in case if some dependencies need to be updated.
Zip files and folder in zip need to be named ``<dep>-<version>``.
Also if cmake already exist in PATH, it won't download it again.

I want opinion on that, if this is right approaches and how to improve it.

cc @vvuk

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

--HG--
rename : servo/python/tidy/servo_tidy_tests/shebang_license.py => servo/python/servo/bootstrapper/__init__.py
2016-09-08 13:57:23 -05:00
Vladimir Vukicevic 1f90e0074c servo: Merge #11756 - MSVC support for Servo, and CMake builds for native code (from vvuk:servo-msvc); r=larsbergstrom
This is the base PR for MSVC builds of servo and dependent crates.  It's got replacements in the Cargo.toml to pull in the right versions, to make sure that crates were properly converted to CMake for all other platforms, not just Windows.  (Servo builds with MSVC 2015 with this PR; also with 2013, though a manual change in rust-mozjs to select a different set of bindings is needed.)

This PR isn't quite ready yet, but I want bors-servo to do builds.

Source-Repo: https://github.com/servo/servo
Source-Revision: ec53136863f20b80caf165d2f15e8a77d614536e
2016-08-17 13:22:52 -05:00
Guillaume Gomez e9909eaf64 servo: Merge #12186 - Implement video-metadata check (from GuillaumeGomez:video-metadata); r=larsbergstrom,jdm,KiChjang
Source-Repo: https://github.com/servo/servo
Source-Revision: d053fb16f6519726c14ac4580301df4883e4af23
2016-07-29 17:46:42 -05:00
UK992 afc6ef2f87 servo: Merge #12573 - Appveyor: Downgrade GCC to 5.4.0-1 (from UK992:appveyor-fix); r=larsbergstrom
Fix building on Appveyor.

Source-Repo: https://github.com/servo/servo
Source-Revision: 7ca826c6eec21b7f8c8ad9377f04a4816d94eff3
2016-07-24 09:18:37 -05:00
UK992 c0899a0bc6 servo: Merge #11066 - Remove auto and try branch from appveyor.yml (from UK992:appveyor); r=larsbergstrom
Closes #9953

r? @larsbergstrom

Source-Repo: https://github.com/servo/servo
Source-Revision: e2e495e58e85aaab620d7a15123810d2fa748c2c
2016-05-07 07:27:18 -07:00
Lars Bergstrom dc833d15d9 servo: Merge #10528 - Invalidate appveyor cache when rust or cargo rev (from larsbergstrom:invalidate_cache); r=edunham
r? @edunham

AppVeyor builds are currently failing due to exceeding the cache size limits (https://ci.appveyor.com/project/servo/servo/history). This happened after the rustup. This patch should ensure we blow away the cache if the rust or cargo versions change.

See:
http://help.appveyor.com/discussions/questions/1788-multiple-build-cache-dependencies

Source-Repo: https://github.com/servo/servo
Source-Revision: ac062931e241d227d91da7e869608308b1172d4e
2016-04-12 08:07:49 +05:01
Lars Bergstrom 61d58dfa0e servo: Merge #10413 - Do AppVeyor builds on the try branch (from larsbergstrom:appveyor_try); r=edunham
r? @edunham

This is required in support of https://github.com/servo/homu/pull/26

Source-Repo: https://github.com/servo/servo
Source-Revision: 1b3ac8125590853e7e4d5cfac1a9b8d25fdcb195
2016-04-07 00:05:56 +05:01
UK992 677766e7cc servo: Merge #10340 - Appveyor: Cancel unnecessary builds on 'auto' branch (from UK992:win32); r=larsbergstrom
This simple script will cancel build on ```auto``` branch if same commit already exist in ```master```.
As a part of solution mentioned in https://github.com/servo/servo/issues/9953

Tested:
Commit on master: [Appveyor/1.0.300](https://ci.appveyor.com/project/UK992/servo-hga0y/build/1.0.300)
Same commit on auto: [Appveyor/1.0.302](https://ci.appveyor.com/project/UK992/servo-hga0y/build/1.0.301)
Different commit on auto:  [Appveyor/1.0.302](https://ci.appveyor.com/project/UK992/servo-hga0y/build/1.0.302)

r? @larsbergstrom

Source-Repo: https://github.com/servo/servo
Source-Revision: 5333f564cd2f97ad78d2edc53f3791461b4b9244
2016-04-02 03:19:33 +05:01
Josh Matthews f355df791e servo: Merge #10238 - Run unit tests on appveyor (from jdm:winunit); r=larsbergstrom
Source-Repo: https://github.com/servo/servo
Source-Revision: e1485718128bff632eff5445583e925ff796bdba
2016-03-30 19:29:30 +05:01
Corey Farwell acf0139ccb servo: Merge #10131 - Move appveyor env var setting our of install steps (from servo:appveyor-env); r=larsbergstrom
Source-Repo: https://github.com/servo/servo
Source-Revision: b59bd294e177d84a2f54cec987f76a5fb97365f1
2016-03-23 19:08:59 +05:01
Manish Goregaokar ba5d9dee9d servo: Merge #9884 - Make appveyor run on auto branch (from Manishearth:appveyor-homu); r=metajack
Source-Repo: https://github.com/servo/servo
Source-Revision: 97e29f3f2c60c0859602f46fba0b23e0058fb289
2016-03-06 09:14:42 +05:01
UK992 adb691c464 servo: Merge #9863 - Fix Windows build and add AppVeyor support (from larsbergstrom:appveyor2); r=edunham
Proof of success: https://ci.appveyor.com/project/larsbergstrom/servo/build/1.0.15

Fixes #9767

Source-Repo: https://github.com/servo/servo
Source-Revision: 08b9fe0c00fc2be24f1c7ca877011f27a2a19599
2016-03-04 07:12:08 +05:01