Skip to content

Commit 3610582

Browse files
committed
servo: Merge #19883 - Re-enable sccache for Linux builds (from aneeshusa: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 --HG-- extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear extra : subtree_revision : 04b98e4452ebe655c59d54f42827b6f3c29b0cd9
1 parent ec2ff2c commit 3610582

File tree

1 file changed

+42
-30
lines changed

1 file changed

+42
-30
lines changed

servo/etc/ci/buildbot_steps.yml

Lines changed: 42 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -96,40 +96,52 @@ mac-rel-intermittent:
9696
- ./etc/ci/check_intermittents.sh --log-raw intermittents.log
9797

9898
linux-dev:
99-
- ./mach clean-nightlies --keep 3 --force
100-
- ./mach clean-cargo-cache --keep 3 --force
101-
- ./mach test-tidy --no-progress --all
102-
- ./mach test-tidy --no-progress --self-test
103-
- ./mach build --dev
104-
- ./mach test-unit
105-
- ./mach package --dev
106-
- ./mach build-cef
107-
- ./mach build --dev --no-default-features --features default-except-unstable
108-
- ./mach build-geckolib
109-
- ./mach test-stylo
110-
- bash ./etc/ci/lockfile_changed.sh
111-
- bash ./etc/ci/manifest_changed.sh
112-
- bash ./etc/ci/check_no_panic.sh
99+
env:
100+
CCACHE: sccache
101+
RUSTC_WRAPPER: sccache
102+
commands:
103+
- ./mach clean-nightlies --keep 3 --force
104+
- ./mach clean-cargo-cache --keep 3 --force
105+
- ./mach test-tidy --no-progress --all
106+
- ./mach test-tidy --no-progress --self-test
107+
- ./mach build --dev
108+
- ./mach test-unit
109+
- ./mach package --dev
110+
- ./mach build-cef
111+
- ./mach build --dev --no-default-features --features default-except-unstable
112+
- ./mach build-geckolib
113+
- ./mach test-stylo
114+
- bash ./etc/ci/lockfile_changed.sh
115+
- bash ./etc/ci/manifest_changed.sh
116+
- bash ./etc/ci/check_no_panic.sh
113117

114118
linux-rel-wpt:
115-
- ./mach clean-nightlies --keep 3 --force
116-
- ./mach clean-cargo-cache --keep 3 --force
117-
- ./mach build --release --with-debug-assertions
118-
- ./mach test-wpt-failure
119-
- ./mach test-wpt --release --processes 24 --total-chunks 2 --this-chunk 1 --log-raw test-wpt.log --log-errorsummary wpt-errorsummary.log --always-succeed
120-
- ./mach filter-intermittents wpt-errorsummary.log --log-intermittents intermittents.log --log-filteredsummary filtered-wpt-errorsummary.log --tracker-api default --reporter-api default
121-
- ./mach test-wpt --release --binary-arg=--multiprocess --processes 24 --log-raw test-wpt-mp.log --log-errorsummary wpt-mp-errorsummary.log eventsource
119+
env:
120+
CCACHE: sccache
121+
RUSTC_WRAPPER: sccache
122+
commands:
123+
- ./mach clean-nightlies --keep 3 --force
124+
- ./mach clean-cargo-cache --keep 3 --force
125+
- ./mach build --release --with-debug-assertions
126+
- ./mach test-wpt-failure
127+
- ./mach test-wpt --release --processes 24 --total-chunks 2 --this-chunk 1 --log-raw test-wpt.log --log-errorsummary wpt-errorsummary.log --always-succeed
128+
- ./mach filter-intermittents wpt-errorsummary.log --log-intermittents intermittents.log --log-filteredsummary filtered-wpt-errorsummary.log --tracker-api default --reporter-api default
129+
- ./mach test-wpt --release --binary-arg=--multiprocess --processes 24 --log-raw test-wpt-mp.log --log-errorsummary wpt-mp-errorsummary.log eventsource
122130

123131
linux-rel-css:
124-
- ./mach clean-nightlies --keep 3 --force
125-
- ./mach clean-cargo-cache --keep 3 --force
126-
- ./mach build --release --with-debug-assertions
127-
- ./mach test-wpt --release --processes 24 --total-chunks 2 --this-chunk 2 --log-raw test-wpt.log --log-errorsummary wpt-errorsummary.log --always-succeed
128-
- ./mach filter-intermittents wpt-errorsummary.log --log-intermittents intermittents.log --log-filteredsummary filtered-wpt-errorsummary.log --tracker-api default --reporter-api default
129-
- ./mach build-geckolib --release
130-
- ./mach test-stylo --release
131-
- bash ./etc/ci/lockfile_changed.sh
132-
- bash ./etc/ci/manifest_changed.sh
132+
env:
133+
CCACHE: sccache
134+
RUSTC_WRAPPER: sccache
135+
commands:
136+
- ./mach clean-nightlies --keep 3 --force
137+
- ./mach clean-cargo-cache --keep 3 --force
138+
- ./mach build --release --with-debug-assertions
139+
- ./mach test-wpt --release --processes 24 --total-chunks 2 --this-chunk 2 --log-raw test-wpt.log --log-errorsummary wpt-errorsummary.log --always-succeed
140+
- ./mach filter-intermittents wpt-errorsummary.log --log-intermittents intermittents.log --log-filteredsummary filtered-wpt-errorsummary.log --tracker-api default --reporter-api default
141+
- ./mach build-geckolib --release
142+
- ./mach test-stylo --release
143+
- bash ./etc/ci/lockfile_changed.sh
144+
- bash ./etc/ci/manifest_changed.sh
133145

134146
linux-nightly:
135147
- ./mach clean-nightlies --keep 3 --force

0 commit comments

Comments
 (0)