File tree Expand file tree Collapse file tree 2 files changed +4
-7
lines changed Expand file tree Collapse file tree 2 files changed +4
-7
lines changed Original file line number Diff line number Diff line change @@ -46,11 +46,9 @@ ENV RUSTUP_HOME=/usr/local/rustup
46
46
RUN curl https://sh.rustup.rs -sSf | bash -s -- --profile minimal --default-toolchain none -y
47
47
ENV PATH="${CARGO_HOME}/bin:${PATH}"
48
48
49
- RUN rustup toolchain install nightly \
50
- && rustup toolchain install $RUST_VERSION \
49
+ RUN rustup toolchain install $RUST_VERSION \
51
50
&& rustup default $RUST_VERSION \
52
51
&& rustup component add clippy rustfmt llvm-tools-preview \
53
- && rustup component add --toolchain nightly llvm-tools-preview \
54
52
&& rustup target add aarch64-unknown-linux-gnu \
55
53
&& rustup target add x86_64-unknown-linux-musl
56
54
@@ -61,7 +59,7 @@ RUN chmod -R a+rw $CARGO_HOME \
61
59
# Install bininstall to make subsequent binaries easier to download
62
60
RUN wget https://github.com/cargo-bins/cargo-binstall/releases/latest/download/cargo-binstall-`uname -m`-unknown-linux-musl.tgz && tar -xf cargo-binstall-`uname -m`-unknown-linux-musl.tgz -C $CARGO_HOME/bin
63
61
# Install documentation and coverage tools
64
- RUN cargo binstall --no-confirm mdbook grcov
62
+ RUN cargo binstall --no-confirm mdbook grcov nextest
65
63
66
64
WORKDIR /build
67
65
ENTRYPOINT ["bash" ]
Original file line number Diff line number Diff line change @@ -44,14 +44,13 @@ RUN 7z x C:/TEMP/llvm.7z -ollvm
44
44
# RUN scoop install rustup
45
45
ADD https://win.rustup.rs C:/TEMP/rustup-init.exe
46
46
RUN C:/TEMP/rustup-init.exe --default-toolchain $env:RUST_VER -y
47
- RUN rustup install nightly
47
+ RUN rustup install stable
48
48
49
49
RUN rustup component add llvm-tools-preview
50
- RUN cargo install mdbook grcov
50
+ RUN cargo install mdbook grcov nextest
51
51
52
52
RUN setx /M PATH $($Env:PATH + ';C:/buildtools/llvm/bin' )
53
53
54
-
55
54
RUN 7z.exe x C:/TEMP/git-install.exe -ogit
56
55
57
56
# RUN cargo install cargo-watch #Activate this for local builds to enable watching
You can’t perform that action at this time.
0 commit comments