Skip to content

Commit

Permalink
servo: Merge #19883 - Re-enable sccache for Linux builds (from aneesh…
Browse files Browse the repository at this point in the history
…usa:reenable-sccache-partially); r=jdm

As far as I know, sccache is working properly
on the non-cross-compiling Linux builders.
For safety, only enable it for the builders that run on PRs,
to avoid breaking our nightly generation and scheduled test runs.

This will also allow testing new versions of sccache more easily.
This implements my suggestion from servo/servo#19858 (comment), and should also let us
handle testing a new sccache: rust-lang/rust#42867 (comment) (our current version of sccache [seems to be 2018-01-09](https://github.com/servo/saltfs/blob/f50214b8fa012e03616ecae1ef2913e6fe9044da/servo-build-dependencies/ci-map.jinja#L5)).

<!-- 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 change the CI configuration

<!-- 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: 78ffce1cbe5fcce4d057b69c3cbf0cd2bc2b449c

UltraBlame original commit: d897da50fc624ee27af7c16c02e368b92f4a6f5e
  • Loading branch information
marco-c committed Oct 2, 2019
1 parent 76c025e commit 5059177
Showing 1 changed file with 30 additions and 0 deletions.
30 changes: 30 additions & 0 deletions servo/etc/ci/buildbot_steps.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1672,6 +1672,16 @@ linux
-
dev
:
env
:
CCACHE
:
sccache
RUSTC_WRAPPER
:
sccache
commands
:
-
.
/
Expand Down Expand Up @@ -1840,6 +1850,16 @@ rel
-
wpt
:
env
:
CCACHE
:
sccache
RUSTC_WRAPPER
:
sccache
commands
:
-
.
/
Expand Down Expand Up @@ -2043,6 +2063,16 @@ rel
-
css
:
env
:
CCACHE
:
sccache
RUSTC_WRAPPER
:
sccache
commands
:
-
.
/
Expand Down

0 comments on commit 5059177

Please sign in to comment.