Merge pull request #2421 from tblah/riscv-official-ci

ci: riscv: Use new official riscv docker image
rust-lang · Jul 17, 2020 · 0443b19 · 0443b19
2 parents 99f5fd4 + 6cf162d
commit 0443b19
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 8 deletions.
diff --git a/ci/docker/riscv64gc-unknown-linux-gnu/Dockerfile b/ci/docker/riscv64gc-unknown-linux-gnu/Dockerfile
@@ -1,11 +1,4 @@
 FROM rust-riscv64gc-unknown-linux-gnu
 
-
-# We install a stable toolchain using rustup anyway, this should stop us getting
-# confused and still having this toolchain in $PATH
-RUN /usr/local/lib/rustlib/uninstall.sh
-# Weirdly that doesn't remove these:
-RUN rm /usr/local/bin/cargo /usr/local/bin/rust*
-
 ENV CC_riscv64gc_unknown_linux_gnu=riscv64-unknown-linux-gnu-gcc \
     CARGO_TARGET_RISCV64GC_UNKNOWN_LINUX_GNU_LINKER=riscv64-unknown-linux-gnu-gcc
diff --git a/ci/fetch-rust-docker.bash b/ci/fetch-rust-docker.bash
@@ -32,7 +32,7 @@ case "$TARGET" in
   x86_64-unknown-freebsd)          image=dist-x86_64-freebsd ;;
   x86_64-unknown-linux-gnu)        image=dist-x86_64-linux ;;
   x86_64-unknown-netbsd)           image=dist-x86_64-netbsd ;;
-  riscv64gc-unknown-linux-gnu)     image=dist-various-1 ;;
+  riscv64gc-unknown-linux-gnu)     image=dist-riscv64-linux ;;
   *) exit ;;
 esac