From 1cca5557b146e0d5b79da6bc0e2e68d04666ec0a Mon Sep 17 00:00:00 2001 From: Jonathan Turner Date: Fri, 8 Nov 2019 07:27:39 +1300 Subject: [PATCH 1/5] Second attempt to remove rust-toolchain --- .azure/azure-pipelines.yml | 4 ++-- docker/Dockerfile.nu-base | 2 +- rust-toolchain | 1 - 3 files changed, 3 insertions(+), 4 deletions(-) delete mode 100644 rust-toolchain diff --git a/.azure/azure-pipelines.yml b/.azure/azure-pipelines.yml index caa63e0164..ec77a1de97 100644 --- a/.azure/azure-pipelines.yml +++ b/.azure/azure-pipelines.yml @@ -35,11 +35,11 @@ steps: then sudo apt-get -y install libxcb-composite0-dev libx11-dev fi - curl https://sh.rustup.rs -sSf | sh -s -- -y --no-modify-path --default-toolchain "stable" + curl https://sh.rustup.rs -sSf | sh -s -- -y --no-modify-path --default-toolchain "1.39.0" export PATH=$HOME/.cargo/bin:$PATH rustc -Vv echo "##vso[task.prependpath]$HOME/.cargo/bin" - rustup component add rustfmt --toolchain "stable" + rustup component add rustfmt --toolchain "1.39.0" displayName: Install Rust - bash: RUSTFLAGS="-D warnings" cargo test --all-features condition: eq(variables['style'], 'unflagged') diff --git a/docker/Dockerfile.nu-base b/docker/Dockerfile.nu-base index 81e4822994..ca3ce44f23 100644 --- a/docker/Dockerfile.nu-base +++ b/docker/Dockerfile.nu-base @@ -12,7 +12,7 @@ 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" +RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --no-modify-path --default-toolchain "1.39.0" ENV PATH=/root/.cargo/bin:$PATH COPY . /code RUN echo "##vso[task.prependpath]/root/.cargo/bin" && \ 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 From c6c6c0f295cbfb90a071b14159209c81e1ec0cab Mon Sep 17 00:00:00 2001 From: Jonathan Turner Date: Fri, 8 Nov 2019 07:44:34 +1300 Subject: [PATCH 2/5] try again --- .azure/azure-pipelines.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.azure/azure-pipelines.yml b/.azure/azure-pipelines.yml index ec77a1de97..7dfae570a5 100644 --- a/.azure/azure-pipelines.yml +++ b/.azure/azure-pipelines.yml @@ -35,11 +35,12 @@ steps: then sudo apt-get -y install libxcb-composite0-dev libx11-dev fi - curl https://sh.rustup.rs -sSf | sh -s -- -y --no-modify-path --default-toolchain "1.39.0" + curl https://sh.rustup.rs -sSf | sh -s -- -y --no-modify-path --default-toolchain "stable" + rustup update export PATH=$HOME/.cargo/bin:$PATH rustc -Vv echo "##vso[task.prependpath]$HOME/.cargo/bin" - rustup component add rustfmt --toolchain "1.39.0" + rustup component add rustfmt --toolchain "stable" displayName: Install Rust - bash: RUSTFLAGS="-D warnings" cargo test --all-features condition: eq(variables['style'], 'unflagged') From ff6026ca7973561dc7c99d6ffe48f798ce7658ce Mon Sep 17 00:00:00 2001 From: Jonathan Turner Date: Fri, 8 Nov 2019 07:47:43 +1300 Subject: [PATCH 3/5] try again --- .azure/azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.azure/azure-pipelines.yml b/.azure/azure-pipelines.yml index 7dfae570a5..f4c24325e3 100644 --- a/.azure/azure-pipelines.yml +++ b/.azure/azure-pipelines.yml @@ -36,8 +36,8 @@ steps: sudo apt-get -y install libxcb-composite0-dev libx11-dev fi curl https://sh.rustup.rs -sSf | sh -s -- -y --no-modify-path --default-toolchain "stable" - rustup update export PATH=$HOME/.cargo/bin:$PATH + rustup update rustc -Vv echo "##vso[task.prependpath]$HOME/.cargo/bin" rustup component add rustfmt --toolchain "stable" From 13314ad1e71042b389bf46e7c75037ff7dec6073 Mon Sep 17 00:00:00 2001 From: Jonathan Turner Date: Fri, 8 Nov 2019 07:54:52 +1300 Subject: [PATCH 4/5] try again --- docker/Dockerfile.nu-base | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docker/Dockerfile.nu-base b/docker/Dockerfile.nu-base index ca3ce44f23..cb4217b4bd 100644 --- a/docker/Dockerfile.nu-base +++ b/docker/Dockerfile.nu-base @@ -12,8 +12,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 "1.39.0" +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 && \ From c42d97fb9738fab843e02b6bcc6b71fda2ed8093 Mon Sep 17 00:00:00 2001 From: Jonathan Turner Date: Fri, 8 Nov 2019 08:00:46 +1300 Subject: [PATCH 5/5] try again --- docker/Dockerfile.nu-base | 1 - 1 file changed, 1 deletion(-) diff --git a/docker/Dockerfile.nu-base b/docker/Dockerfile.nu-base index cb4217b4bd..3adee88e78 100644 --- a/docker/Dockerfile.nu-base +++ b/docker/Dockerfile.nu-base @@ -11,7 +11,6 @@ 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