Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(deps): Bump cargo-nextest #20572

Merged
merged 1 commit into from
May 28, 2024
Merged

chore(deps): Bump cargo-nextest #20572

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion scripts/e2e/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 1 addition & 4 deletions scripts/environment/bootstrap-windows-2019.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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
4 changes: 2 additions & 2 deletions scripts/environment/prepare.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion scripts/integration/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading