From ecd97f929f413ea4a5660686f98286cf9bce1b56 Mon Sep 17 00:00:00 2001 From: Andrew Reusch Date: Wed, 11 Aug 2021 10:58:38 -0700 Subject: [PATCH] Install rust in ci-lint so cargo fmt can move to lint stage. --- docker/Dockerfile.ci_cpu | 4 ++-- docker/Dockerfile.ci_lint | 9 ++++++++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/docker/Dockerfile.ci_cpu b/docker/Dockerfile.ci_cpu index bc6c0f116c1e..d692a13db2fa 100644 --- a/docker/Dockerfile.ci_cpu +++ b/docker/Dockerfile.ci_cpu @@ -51,6 +51,7 @@ COPY install/ubuntu_install_rust.sh /install/ubuntu_install_rust.sh RUN bash /install/ubuntu_install_rust.sh ENV RUSTUP_HOME /opt/rust ENV CARGO_HOME /opt/rust +ENV PATH $PATH:$CARGO_HOME/bin # AutoTVM deps COPY install/ubuntu_install_redis.sh /install/ubuntu_install_redis.sh @@ -59,13 +60,12 @@ RUN bash /install/ubuntu_install_redis.sh # Golang environment COPY install/ubuntu_install_golang.sh /install/ubuntu_install_golang.sh RUN bash /install/ubuntu_install_golang.sh +ENV PATH $PATH:/usr/lib/go-1.10/bin # NNPACK deps COPY install/ubuntu_install_nnpack.sh /install/ubuntu_install_nnpack.sh RUN bash /install/ubuntu_install_nnpack.sh -ENV PATH $PATH:$CARGO_HOME/bin:/usr/lib/go-1.10/bin - # ANTLR deps COPY install/ubuntu_install_java.sh /install/ubuntu_install_java.sh RUN bash /install/ubuntu_install_java.sh diff --git a/docker/Dockerfile.ci_lint b/docker/Dockerfile.ci_lint index 7ef690fc7c27..20bcfe6de903 100644 --- a/docker/Dockerfile.ci_lint +++ b/docker/Dockerfile.ci_lint @@ -30,10 +30,17 @@ RUN bash /install/ubuntu1804_install_python.sh # Globally disable pip cache RUN pip config set global.cache-dir false -RUN apt-get update && apt-get install -y doxygen graphviz +RUN apt-get update && apt-get install -y doxygen graphviz curl RUN pip3 install cpplint pylint==2.4.4 mypy==0.902 black==20.8b1 flake8==3.9.2 +# Rust env (build early; takes a while) +COPY install/ubuntu_install_rust.sh /install/ubuntu_install_rust.sh +RUN bash /install/ubuntu_install_rust.sh +ENV RUSTUP_HOME /opt/rust +ENV CARGO_HOME /opt/rust +ENV PATH $PATH:$CARGO_HOME/bin + # java deps for rat COPY install/ubuntu_install_java.sh /install/ubuntu_install_java.sh RUN bash /install/ubuntu_install_java.sh