Skip to content

Commit 0d6abc0

Browse files
authored
ci: remove nightly, add nextest for junit reports
2 parents d258923 + 000aab2 commit 0d6abc0

File tree

2 files changed

+4
-7
lines changed

2 files changed

+4
-7
lines changed

linux/Dockerfile

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,9 @@ ENV RUSTUP_HOME=/usr/local/rustup
4646
RUN curl https://sh.rustup.rs -sSf | bash -s -- --profile minimal --default-toolchain none -y
4747
ENV PATH="${CARGO_HOME}/bin:${PATH}"
4848

49-
RUN rustup toolchain install nightly \
50-
&& rustup toolchain install $RUST_VERSION \
49+
RUN rustup toolchain install $RUST_VERSION \
5150
&& rustup default $RUST_VERSION \
5251
&& rustup component add clippy rustfmt llvm-tools-preview \
53-
&& rustup component add --toolchain nightly llvm-tools-preview \
5452
&& rustup target add aarch64-unknown-linux-gnu \
5553
&& rustup target add x86_64-unknown-linux-musl
5654

@@ -61,7 +59,7 @@ RUN chmod -R a+rw $CARGO_HOME \
6159
#Install bininstall to make subsequent binaries easier to download
6260
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
6361
#Install documentation and coverage tools
64-
RUN cargo binstall --no-confirm mdbook grcov
62+
RUN cargo binstall --no-confirm mdbook grcov nextest
6563

6664
WORKDIR /build
6765
ENTRYPOINT ["bash"]

windows/Dockerfile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,14 +44,13 @@ RUN 7z x C:/TEMP/llvm.7z -ollvm
4444
# RUN scoop install rustup
4545
ADD https://win.rustup.rs C:/TEMP/rustup-init.exe
4646
RUN C:/TEMP/rustup-init.exe --default-toolchain $env:RUST_VER -y
47-
RUN rustup install nightly
47+
RUN rustup install stable
4848

4949
RUN rustup component add llvm-tools-preview
50-
RUN cargo install mdbook grcov
50+
RUN cargo install mdbook grcov nextest
5151

5252
RUN setx /M PATH $($Env:PATH + ';C:/buildtools/llvm/bin')
5353

54-
5554
RUN 7z.exe x C:/TEMP/git-install.exe -ogit
5655

5756
#RUN cargo install cargo-watch #Activate this for local builds to enable watching

0 commit comments

Comments
 (0)