Skip to content

Commit

Permalink
ci: remove nightly, add nextest
Browse files Browse the repository at this point in the history
  • Loading branch information
mhasel committed May 27, 2024
1 parent d258923 commit a3449c5
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 6 deletions.
6 changes: 3 additions & 3 deletions linux/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -62,6 +60,8 @@ RUN chmod -R a+rw $CARGO_HOME \
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
#Install nextest from source - standalone binary does not work for tests. (nextest can't be called in the context of cargo, `nextest run` only prints "Hello World!")
RUN cargo install cargo-nextest

WORKDIR /build
ENTRYPOINT ["bash"]
Expand Down
5 changes: 2 additions & 3 deletions windows/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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

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
Expand Down

0 comments on commit a3449c5

Please sign in to comment.