[incubator-nuttx] branch master updated: ci: harmonize rust installation paths.

[xiaoxiang]

This is an automated email from the ASF dual-hosted git repository.

xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git


The following commit(s) were added to refs/heads/master by this push:
     new 29c55cd  ci: harmonize rust installation paths.
29c55cd is described below

commit 29c55cdda66618f1b8390c5552043779dfd95222
Author: Piet <p...@mailbox.org>
AuthorDate: Tue Feb 22 22:11:12 2022 +0100

    ci: harmonize rust installation paths.
---
 tools/ci/docker/linux/Dockerfile | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/tools/ci/docker/linux/Dockerfile b/tools/ci/docker/linux/Dockerfile
index b1866c4..434a781 100644
--- a/tools/ci/docker/linux/Dockerfile
+++ b/tools/ci/docker/linux/Dockerfile
@@ -60,8 +60,9 @@ RUN mkdir bloaty -p \
   && make install
 
 # Install Rust and targets supported from NuttX
-ENV CARGO_HOME=/tools/rust
-ENV RUSTUP_HOME=/tools/rust/rustup
+ENV RUST_HOME=/tools/rust
+ENV CARGO_HOME=$RUST_HOME/cargo
+ENV RUSTUP_HOME=$RUST_HOME/rustup
 RUN mkdir -p $CARGO_HOME \
   && curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y \
   && $CARGO_HOME/bin/rustup target add thumbv6m-none-eabi \
@@ -264,9 +265,9 @@ ENV PATH="/tools/bloaty/bin:$PATH"
 
 # Pull in the Rust toolchain including supported targets
 COPY --from=nuttx-tools /tools/rust/ /tools/rust/
-ENV CARGO_HOME=/tools/rust
+ENV CARGO_HOME=/tools/rust/cargo
 ENV RUSTUP_HOME=/tools/rust/rustup
-ENV PATH="/tools/rust/bin:$PATH"
+ENV PATH="/tools/rust/cargo/bin:$PATH"
 
 # ARM toolchain
 COPY --from=nuttx-toolchain-arm /tools/gcc-arm-none-eabi/ gcc-arm-none-eabi/