diff --git a/.azure/azure-pipelines.yml b/.azure/azure-pipelines.yml index caa63e0164..f4c24325e3 100644 --- a/.azure/azure-pipelines.yml +++ b/.azure/azure-pipelines.yml @@ -37,6 +37,7 @@ steps: fi curl https://sh.rustup.rs -sSf | sh -s -- -y --no-modify-path --default-toolchain "stable" export PATH=$HOME/.cargo/bin:$PATH + rustup update rustc -Vv echo "##vso[task.prependpath]$HOME/.cargo/bin" rustup component add rustfmt --toolchain "stable" diff --git a/docker/Dockerfile.nu-base b/docker/Dockerfile.nu-base index 81e4822994..3adee88e78 100644 --- a/docker/Dockerfile.nu-base +++ b/docker/Dockerfile.nu-base @@ -11,9 +11,9 @@ RUN apt-get update && apt-get install -y libssl-dev \ ARG RELEASE=false WORKDIR /code -COPY ./rust-toolchain ./rust-toolchain RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --no-modify-path --default-toolchain "stable" ENV PATH=/root/.cargo/bin:$PATH +RUN rustup update COPY . /code RUN echo "##vso[task.prependpath]/root/.cargo/bin" && \ rustc -Vv && \ diff --git a/rust-toolchain b/rust-toolchain deleted file mode 100644 index 5edffce6d5..0000000000 --- a/rust-toolchain +++ /dev/null @@ -1 +0,0 @@ -1.39.0