Mirrors/nushell
2
0
Fork 0
mirror of https://github.com/nushell/nushell synced 2025-01-15 06:34:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #940 from jonathandturner/stable_v2

Browse source 
Second attempt to remove rust-toolchain
This commit is contained in:
Jonathan Turner 2019-11-07 11:18:50 -08:00 committed by GitHub
commit 5dfc81a157
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.azure/azure-pipelines.yml
View file

@ -37,6 +37,7 @@ steps:
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 "stable"
export PATH=$HOME/.cargo/bin:$PATH export PATH=$HOME/.cargo/bin:$PATH
rustup update
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 "stable"

2
docker/Dockerfile.nu-base
View file

@ -11,9 +11,9 @@ 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
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 "stable"
ENV PATH=/root/.cargo/bin:$PATH ENV PATH=/root/.cargo/bin:$PATH
RUN rustup update
COPY . /code COPY . /code
RUN echo "##vso[task.prependpath]/root/.cargo/bin" && \ RUN echo "##vso[task.prependpath]/root/.cargo/bin" && \
rustc -Vv && \ rustc -Vv && \

1
rust-toolchain
View file

@ -1 +0,0 @@
1.39.0