Mirrors/nushell
2
0
Fork 0
mirror of https://github.com/nushell/nushell synced 2024-09-22 15:42:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

Second attempt to remove rust-toolchain

Browse source
This commit is contained in:
Jonathan Turner 2019-11-08 07:27:39 +13:00
parent 56dd0282f0
commit 1cca5557b1
3 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.azure/azure-pipelines.yml
View file

@ -35,11 +35,11 @@ steps:
then then
sudo apt-get -y install libxcb-composite0-dev libx11-dev sudo apt-get -y install libxcb-composite0-dev libx11-dev
fi 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 export PATH=$HOME/.cargo/bin:$PATH
rustc -Vv rustc -Vv
echo "##vso[task.prependpath]$HOME/.cargo/bin" echo "##vso[task.prependpath]$HOME/.cargo/bin"
rustup component add rustfmt --toolchain "stable" rustup component add rustfmt --toolchain "1.39.0"
displayName: Install Rust displayName: Install Rust
- bash: RUSTFLAGS="-D warnings" cargo test --all-features - bash: RUSTFLAGS="-D warnings" cargo test --all-features
condition: eq(variables['style'], 'unflagged') condition: eq(variables['style'], 'unflagged')

2
docker/Dockerfile.nu-base
View file

@ -12,7 +12,7 @@ RUN apt-get update && apt-get install -y libssl-dev \
ARG RELEASE=false ARG RELEASE=false
WORKDIR /code WORKDIR /code
COPY ./rust-toolchain ./rust-toolchain 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 ENV PATH=/root/.cargo/bin:$PATH
COPY . /code COPY . /code
RUN echo "##vso[task.prependpath]/root/.cargo/bin" && \ RUN echo "##vso[task.prependpath]/root/.cargo/bin" && \

1
rust-toolchain
View file

@ -1 +0,0 @@
1.39.0