diff --git a/build-x86_64-linux.dockerfile b/build-x86_64-linux.dockerfile index df71fc6edbe..ca9d1d90128 100644 --- a/build-x86_64-linux.dockerfile +++ b/build-x86_64-linux.dockerfile @@ -12,51 +12,61 @@ ENV \ # https://stackoverflow.com/questions/44331836/apt-get-install-tzdata-noninteractive DEBIAN_FRONTEND=noninteractive -RUN apt-get update -q && apt-get install -qy --no-install-recommends \ - # - # Cloning the repository - git \ - ca-certificates \ - # - # Installing rustup - curl \ - # - # Running mach - python2.7 \ - python-virtualenv \ - virtualenv \ - # - # Multiple C/C++ dependencies built from source - g++ \ - make \ - cmake \ - # - # ANGLE - xorg-dev \ - # - # mozjs (SpiderMonkey) - autoconf2.13 \ - # - # Bindgen (for SpiderMonkey bindings) - clang \ - # - # gstreamer - libglib2.0-dev \ - libgstreamer-plugins-base1.0-dev \ - libgstreamer-plugins-bad1.0-dev \ - libgstreamer1.0-dev \ - # - # OpenSSL - libssl1.0-dev \ - # - # blurz - libdbus-1-dev \ - # - # Skia - libglu1-mesa-dev \ - libbz2-dev \ - # - # +RUN \ + apt-get update -q && \ + apt-get install -qy --no-install-recommends \ + # + # Cloning the repository + git \ + ca-certificates \ + # + # Installing rustup + curl \ + # + # Running mach + python2.7 \ + python-virtualenv \ + virtualenv \ + # + # Multiple C/C++ dependencies built from source + g++ \ + make \ + cmake \ + # + # ANGLE + xorg-dev \ + # + # mozjs (SpiderMonkey) + autoconf2.13 \ + # + # Bindgen (for SpiderMonkey bindings) + clang \ + # + # gstreamer + libglib2.0-dev \ + libgstreamer-plugins-base1.0-dev \ + libgstreamer-plugins-bad1.0-dev \ + libgstreamer1.0-dev \ + # + # OpenSSL + libssl1.0-dev \ + # + # blurz + libdbus-1-dev \ + # + # Skia + libglu1-mesa-dev \ + libbz2-dev \ + # + # && \ - curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain none -y + # + # + curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain none -y && \ + # + # + curl -sSfL \ + https://github.com/mozilla/sccache/releases/download/0.2.7/sccache-0.2.7-x86_64-unknown-linux-musl.tar.gz \ + | tar -xz --strip-components=1 -C /usr/local/bin/ \ + sccache-0.2.7-x86_64-unknown-linux-musl/sccache diff --git a/decision-task.py b/decision-task.py index 061630c182d..1541d972859 100644 --- a/decision-task.py +++ b/decision-task.py @@ -46,6 +46,7 @@ def main(): decision.create_task_with_in_tree_dockerfile( task_name="Linux x86_64: tidy + dev build + unit tests", command=""" + sccache --version ./mach test-tidy --no-progress --all #./mach build --dev #./mach test-unit