diff --git a/scripts/e2e/Dockerfile b/scripts/e2e/Dockerfile index f976155d47e8d..495c69275cad4 100644 --- a/scripts/e2e/Dockerfile +++ b/scripts/e2e/Dockerfile @@ -28,7 +28,7 @@ RUN git clone https://github.com/rui314/mold.git \ && cmake --build . -j $(nproc) \ && cmake --install . -RUN rustup run "${RUST_VERSION}" cargo install cargo-nextest --version 0.9.64 --locked +RUN rustup run "${RUST_VERSION}" cargo install cargo-nextest --version 0.9.72 --locked COPY scripts/environment/install-protoc.sh / COPY tests/data/ca/certs /certs diff --git a/scripts/environment/bootstrap-windows-2019.ps1 b/scripts/environment/bootstrap-windows-2019.ps1 index 457d8a599af85..bc3ccfca9681c 100644 --- a/scripts/environment/bootstrap-windows-2019.ps1 +++ b/scripts/environment/bootstrap-windows-2019.ps1 @@ -9,7 +9,7 @@ echo "CARGO_BUILD_JOBS=$N_JOBS" | Out-File -FilePath $env:GITHUB_ENV -Encoding u if ($env:RELEASE_BUILDER -ne "true") { # Ensure we have cargo-next test installed. - rustup run stable cargo install cargo-nextest --version 0.9.64 --locked + rustup run stable cargo install cargo-nextest --version 0.9.72 --locked } # Install some required dependencies / tools. @@ -25,6 +25,3 @@ echo "OPENSSL_SRC_PERL=C:\Strawberry\perl\bin\perl.exe" | Out-File -FilePath $en # Force the proto-build crate to avoid building the vendored protoc. echo "PROTO_NO_VENDOR=1" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append - -# Workaround for https://github.com/nextest-rs/nextest/issues/1493 -echo "RUSTUP_WINDOWS_PATH_ADD_BIN=1" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append diff --git a/scripts/environment/prepare.sh b/scripts/environment/prepare.sh index c621871024eba..592780be3d69a 100755 --- a/scripts/environment/prepare.sh +++ b/scripts/environment/prepare.sh @@ -11,8 +11,8 @@ fi if [[ "$(cross --version | grep cross)" != "cross 0.2.5" ]] ; then rustup run stable cargo install cross --version 0.2.5 --force --locked fi -if [[ "$(cargo-nextest --version)" != "cargo-nextest 0.9.64" ]] ; then - rustup run stable cargo install cargo-nextest --version 0.9.64 --force --locked +if [[ "$(cargo-nextest --version)" != "cargo-nextest 0.9.72" ]] ; then + rustup run stable cargo install cargo-nextest --version 0.9.72 --force --locked fi if ! cargo deny --version >& /dev/null ; then rustup run stable cargo install cargo-deny --force --locked diff --git a/scripts/integration/Dockerfile b/scripts/integration/Dockerfile index 6205c96eb56fe..07ffd19738823 100644 --- a/scripts/integration/Dockerfile +++ b/scripts/integration/Dockerfile @@ -16,7 +16,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ git \ && rm -rf /var/lib/apt/lists/* -RUN rustup run "${RUST_VERSION}" cargo install cargo-nextest --version 0.9.64 --locked +RUN rustup run "${RUST_VERSION}" cargo install cargo-nextest --version 0.9.72 --locked COPY scripts/environment/install-protoc.sh / COPY tests/data/ca/certs /certs