From 9359bacf8f461cdb4d60fdeb4559699ec9aae0e9 Mon Sep 17 00:00:00 2001 From: Ron <45816308+rjaegers@users.noreply.github.com> Date: Wed, 22 Jan 2025 14:16:07 +0100 Subject: [PATCH] feat: update Rust ecosystem to v1.84.0 (#700) * deps(cpp, rust): update git to 1:2.43.0-1ubuntu7.2 * deps: update Rust tooling Update Rust to v1.84.0 Update cargo-binstal to v1.10.22 Update cargo-mutants to v25.0.0 Update flip-link to v0.1.10 Update probe-rs-tools to v0.26.0 * chore: test cargo-binstall for probe-rs-tools * chore: debug probe-rs-tools install failure * chore: try to form correct pkg-url for probe-rs aarch64 * chore: try different strategy * chore: fix typo in cargo-binstall arguments * chore: retest * chore: revert and split off to separate PR * chore: make coverage test robust against changing toolchain versions --- .devcontainer/rust/Dockerfile | 8 ++++---- test/rust/integration-tests.bats | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.devcontainer/rust/Dockerfile b/.devcontainer/rust/Dockerfile index 39ebec7b..08fd616b 100644 --- a/.devcontainer/rust/Dockerfile +++ b/.devcontainer/rust/Dockerfile @@ -1,8 +1,8 @@ FROM ubuntu:24.04@sha256:80dd3c3b9c6cecb9f1667e9290b3bc61b78c2678c02cbdae5f0fea92cc6734ab ARG BATS_VERSION=1.11.0 -ARG CARGO_BINSTALL_VERSION=1.10.8 -ARG RUST_VERSION=1.81.0 +ARG CARGO_BINSTALL_VERSION=1.10.22 +ARG RUST_VERSION=1.84.0 ARG DEBIAN_FRONTEND=noninteractive @@ -47,6 +47,6 @@ RUN update-alternatives --install /usr/bin/cc cc /usr/bin/gcc-14 20 \ ENV BINSTALL_DISABLE_TELEMETRY=true # Install additional rust tools RUN wget -qO - "https://github.com/cargo-bins/cargo-binstall/releases/download/v${CARGO_BINSTALL_VERSION}/cargo-binstall-$(uname -m)-unknown-linux-gnu.tgz" | tar xz -C "/usr/bin" \ - && cargo-binstall -y --locked cargo-binutils@0.3.6 cargo-mutants@24.9.0 flip-link@0.1.9 \ + && cargo-binstall -y --locked cargo-binutils@0.3.6 cargo-mutants@25.0.0 flip-link@0.1.10 \ # cargo-binstall can't (yet) install probe-rs-tools for aarch64, fall-back to script installation - && wget -qO - https://github.com/probe-rs/probe-rs/releases/download/v0.24.0/probe-rs-tools-installer.sh | sh + && wget -qO - https://github.com/probe-rs/probe-rs/releases/download/v0.26.0/probe-rs-tools-installer.sh | sh diff --git a/test/rust/integration-tests.bats b/test/rust/integration-tests.bats index 8e16f2ea..c4c0c098 100644 --- a/test/rust/integration-tests.bats +++ b/test/rust/integration-tests.bats @@ -97,7 +97,7 @@ EOF cargo profdata -- merge -sparse default_*.profraw -o default.profdata - run cargo cov -- report --instr-profile=default.profdata --object target/debug/deps/test-79ff237e4a2ee06d + run cargo cov -- report --instr-profile=default.profdata --object $(find target/debug/deps -name "test-*" -executable) assert_success assert_output --partial "77.78%"