From 9f59050677c3c3eeae224101a5bfcc7c11a01b0e Mon Sep 17 00:00:00 2001
From: Aneesh Agrawal <aneeshusa@gmail.com>
Date: Sat, 27 Jan 2018 15:26:41 -0800
Subject: [PATCH] Re-enable sccache for Linux builds

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.
---
 etc/ci/buildbot_steps.yml | 72 +++++++++++++++++++++++----------------
 1 file changed, 42 insertions(+), 30 deletions(-)

diff --git a/etc/ci/buildbot_steps.yml b/etc/ci/buildbot_steps.yml
index df86cee287e..225ae02e333 100644
--- a/etc/ci/buildbot_steps.yml
+++ b/etc/ci/buildbot_steps.yml
@@ -96,40 +96,52 @@ mac-rel-intermittent:
   - ./etc/ci/check_intermittents.sh --log-raw intermittents.log
 
 linux-dev:
-  - ./mach clean-nightlies --keep 3 --force
-  - ./mach clean-cargo-cache --keep 3 --force
-  - ./mach test-tidy --no-progress --all
-  - ./mach test-tidy --no-progress --self-test
-  - ./mach build --dev
-  - ./mach test-unit
-  - ./mach package --dev
-  - ./mach build-cef
-  - ./mach build --dev --no-default-features --features default-except-unstable
-  - ./mach build-geckolib
-  - ./mach test-stylo
-  - bash ./etc/ci/lockfile_changed.sh
-  - bash ./etc/ci/manifest_changed.sh
-  - bash ./etc/ci/check_no_panic.sh
+  env:
+    CCACHE: sccache
+    RUSTC_WRAPPER: sccache
+  commands:
+    - ./mach clean-nightlies --keep 3 --force
+    - ./mach clean-cargo-cache --keep 3 --force
+    - ./mach test-tidy --no-progress --all
+    - ./mach test-tidy --no-progress --self-test
+    - ./mach build --dev
+    - ./mach test-unit
+    - ./mach package --dev
+    - ./mach build-cef
+    - ./mach build --dev --no-default-features --features default-except-unstable
+    - ./mach build-geckolib
+    - ./mach test-stylo
+    - bash ./etc/ci/lockfile_changed.sh
+    - bash ./etc/ci/manifest_changed.sh
+    - bash ./etc/ci/check_no_panic.sh
 
 linux-rel-wpt:
-  - ./mach clean-nightlies --keep 3 --force
-  - ./mach clean-cargo-cache --keep 3 --force
-  - ./mach build --release --with-debug-assertions
-  - ./mach test-wpt-failure
-  - ./mach test-wpt --release --processes 24 --total-chunks 2 --this-chunk 1 --log-raw test-wpt.log --log-errorsummary wpt-errorsummary.log --always-succeed
-  - ./mach filter-intermittents wpt-errorsummary.log --log-intermittents intermittents.log --log-filteredsummary filtered-wpt-errorsummary.log --tracker-api default --reporter-api default
-  - ./mach test-wpt --release --binary-arg=--multiprocess --processes 24 --log-raw test-wpt-mp.log --log-errorsummary wpt-mp-errorsummary.log eventsource
+  env:
+    CCACHE: sccache
+    RUSTC_WRAPPER: sccache
+  commands:
+    - ./mach clean-nightlies --keep 3 --force
+    - ./mach clean-cargo-cache --keep 3 --force
+    - ./mach build --release --with-debug-assertions
+    - ./mach test-wpt-failure
+    - ./mach test-wpt --release --processes 24 --total-chunks 2 --this-chunk 1 --log-raw test-wpt.log --log-errorsummary wpt-errorsummary.log --always-succeed
+    - ./mach filter-intermittents wpt-errorsummary.log --log-intermittents intermittents.log --log-filteredsummary filtered-wpt-errorsummary.log --tracker-api default --reporter-api default
+    - ./mach test-wpt --release --binary-arg=--multiprocess --processes 24 --log-raw test-wpt-mp.log --log-errorsummary wpt-mp-errorsummary.log eventsource
 
 linux-rel-css:
-  - ./mach clean-nightlies --keep 3 --force
-  - ./mach clean-cargo-cache --keep 3 --force
-  - ./mach build --release --with-debug-assertions
-  - ./mach test-wpt --release --processes 24 --total-chunks 2 --this-chunk 2 --log-raw test-wpt.log --log-errorsummary wpt-errorsummary.log --always-succeed
-  - ./mach filter-intermittents wpt-errorsummary.log --log-intermittents intermittents.log --log-filteredsummary filtered-wpt-errorsummary.log --tracker-api default --reporter-api default
-  - ./mach build-geckolib --release
-  - ./mach test-stylo --release
-  - bash ./etc/ci/lockfile_changed.sh
-  - bash ./etc/ci/manifest_changed.sh
+  env:
+    CCACHE: sccache
+    RUSTC_WRAPPER: sccache
+  commands:
+    - ./mach clean-nightlies --keep 3 --force
+    - ./mach clean-cargo-cache --keep 3 --force
+    - ./mach build --release --with-debug-assertions
+    - ./mach test-wpt --release --processes 24 --total-chunks 2 --this-chunk 2 --log-raw test-wpt.log --log-errorsummary wpt-errorsummary.log --always-succeed
+    - ./mach filter-intermittents wpt-errorsummary.log --log-intermittents intermittents.log --log-filteredsummary filtered-wpt-errorsummary.log --tracker-api default --reporter-api default
+    - ./mach build-geckolib --release
+    - ./mach test-stylo --release
+    - bash ./etc/ci/lockfile_changed.sh
+    - bash ./etc/ci/manifest_changed.sh
 
 linux-nightly:
   - ./mach clean-nightlies --keep 3 --force