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

feat: update Rust ecosystem to v1.84.0 #700

Merged
merged 10 commits into from
Jan 23, 2025
Merged

feat: update Rust ecosystem to v1.84.0 #700

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
9644b7e
deps(cpp, rust): update git to 1:2.43.0-1ubuntu7.2
rjaegers Jan 21, 2025
8c0a8b2
deps: update Rust tooling
rjaegers Jan 21, 2025
72c66f2
chore: test cargo-binstall for probe-rs-tools
rjaegers Jan 21, 2025
4ec725e
chore: debug probe-rs-tools install failure
rjaegers Jan 21, 2025
a786c3a
chore: try to form correct pkg-url for probe-rs aarch64
rjaegers Jan 21, 2025
4f505e5
chore: try different strategy
rjaegers Jan 21, 2025
65c5f26
chore: fix typo in cargo-binstall arguments
rjaegers Jan 21, 2025
1f353f8
chore: retest
rjaegers Jan 21, 2025
cb33e74
chore: revert and split off to separate PR
rjaegers Jan 21, 2025
a1a57a0
chore: make coverage test robust against changing toolchain versions
rjaegers Jan 21, 2025
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 .devcontainer/cpp/apt-requirements-base.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"ca-certificates": "20240203",
"g++-14": "14.2.0-4ubuntu2~24.04",
"gdb-multiarch": "15.0.50.20240403-0ubuntu1",
"git": "1:2.43.0-1ubuntu7.1",
"git": "1:2.43.0-1ubuntu7.2",
"gnupg2": "2.4.4-2ubuntu17",
"ninja-build": "1.11.1-2",
"python3-pip": "24.0+dfsg-1ubuntu1.1",
Expand Down
8 changes: 4 additions & 4 deletions .devcontainer/rust/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand Down Expand Up @@ -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 [email protected] cargo-mutants@24.9.0 [email protected].9 \
&& cargo-binstall -y --locked [email protected] cargo-mutants@25.0.0 [email protected].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
2 changes: 1 addition & 1 deletion .devcontainer/rust/apt-requirements-base.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"bash-completion": "1:2.11-8",
"ca-certificates": "20240203",
"g++-14": "14.2.0-4ubuntu2~24.04",
"git": "1:2.43.0-1ubuntu7.1",
"git": "1:2.43.0-1ubuntu7.2",
"gnupg2": "2.4.4-2ubuntu17",
"libc6-dev": "2.39-0ubuntu8.3",
"rustup": "1.26.0-5build1",
Expand Down
2 changes: 1 addition & 1 deletion test/rust/integration-tests.bats
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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%"

Expand Down
Loading