From 000aab25c9925fe5de315caec5ce6ab3d79b269b Mon Sep 17 00:00:00 2001 From: Michael Haselberger Date: Mon, 27 May 2024 11:28:20 +0200 Subject: [PATCH] ci: remove nightly, add nextest --- linux/Dockerfile | 6 ++---- windows/Dockerfile | 5 ++--- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/linux/Dockerfile b/linux/Dockerfile index e3356a6..f889d6f 100755 --- a/linux/Dockerfile +++ b/linux/Dockerfile @@ -46,11 +46,9 @@ ENV RUSTUP_HOME=/usr/local/rustup RUN curl https://sh.rustup.rs -sSf | bash -s -- --profile minimal --default-toolchain none -y ENV PATH="${CARGO_HOME}/bin:${PATH}" -RUN rustup toolchain install nightly \ - && rustup toolchain install $RUST_VERSION \ +RUN rustup toolchain install $RUST_VERSION \ && rustup default $RUST_VERSION \ && rustup component add clippy rustfmt llvm-tools-preview \ - && rustup component add --toolchain nightly llvm-tools-preview \ && rustup target add aarch64-unknown-linux-gnu \ && rustup target add x86_64-unknown-linux-musl @@ -61,7 +59,7 @@ RUN chmod -R a+rw $CARGO_HOME \ #Install bininstall to make subsequent binaries easier to download 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 #Install documentation and coverage tools -RUN cargo binstall --no-confirm mdbook grcov +RUN cargo binstall --no-confirm mdbook grcov nextest WORKDIR /build ENTRYPOINT ["bash"] diff --git a/windows/Dockerfile b/windows/Dockerfile index 6de418d..6842fba 100644 --- a/windows/Dockerfile +++ b/windows/Dockerfile @@ -44,14 +44,13 @@ RUN 7z x C:/TEMP/llvm.7z -ollvm # RUN scoop install rustup ADD https://win.rustup.rs C:/TEMP/rustup-init.exe RUN C:/TEMP/rustup-init.exe --default-toolchain $env:RUST_VER -y -RUN rustup install nightly +RUN rustup install stable RUN rustup component add llvm-tools-preview -RUN cargo install mdbook grcov +RUN cargo install mdbook grcov nextest RUN setx /M PATH $($Env:PATH + ';C:/buildtools/llvm/bin') - RUN 7z.exe x C:/TEMP/git-install.exe -ogit #RUN cargo install cargo-watch #Activate this for local builds to enable watching