diff --git a/Cargo.lock b/Cargo.lock index 1b37fe8e2df..6575f1385da 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -619,9 +619,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.50" +version = "1.0.65" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95e28fa049fda1c330bcf9d723be7663a899c4679724b34c81e9f5a326aab8cd" +checksum = "95752358c8f7552394baf48cd82695b345628ad3f170d607de3ca03b8dacca15" dependencies = [ "jobserver", ] diff --git a/etc/taskcluster/docker/build.dockerfile b/etc/taskcluster/docker/build.dockerfile index 0d574a247b0..60ae5606cdb 100644 --- a/etc/taskcluster/docker/build.dockerfile +++ b/etc/taskcluster/docker/build.dockerfile @@ -46,10 +46,8 @@ RUN \ # # Install the version of rustup that is current when this Docker image is being built: # We want at least 1.21 (increment in this comment to force an image rebuild). - curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain none --profile=minimal -y && \ + curl https://sh.rustup.rs -sSf | sh -s -- --profile=minimal -y && \ # - # - curl -sSfL \ - https://github.com/mozilla/sccache/releases/download/0.2.12/sccache-0.2.12-x86_64-unknown-linux-musl.tar.gz \ - | tar -xz --strip-components=1 -C /usr/local/bin/ \ - sccache-0.2.12-x86_64-unknown-linux-musl/sccache + # There are no sccache binary releases that include this commit, so we install a particular + # git commit instead. + ~/.cargo/bin/cargo install sccache --git https://github.com/mozilla/sccache/ --rev e66c9c15142a7e583d6ab80bd614bdffb2ebcc47