fixup! ci install_extra_deps: let rust-toolchain.toml control toolchain

sporksmith · sporksmith · commit d79a38334550 · 2022-12-16T12:41:01.000-06:00
diff --git a/ci/container_scripts/install_extra_deps.sh b/ci/container_scripts/install_extra_deps.sh
@@ -59,15 +59,15 @@ case "$CC" in
         ;;
 esac
 
-curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --no-modify-path
-rustup set profile minimal
+curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --no-modify-path --default-toolchain none --profile minimal
+source "$HOME/.cargo/env"
+
 if [ "${BUILDTYPE:-}" = coverage ]
+then
   # Add a directory override, which overrides rust-toolchain.toml
   rustup override set nightly-2022-10-14
 fi
 
-PATH="$HOME/.cargo/bin:$PATH"
-
 # For debugging
 cargo --version
 
