Skip to content

Commit 5a93f8a

Browse files
authored
feat: update to Rust 1.96 (#2680)
<!-- Describe what this PR does --> ## Related issues <!-- Refer to existing GitHub issues here --> ## Type of Change <!-- Check one that best describes this PR --> - [ ] **Add** - New feature or capability - [ ] **Change** - Changes in existing functionality - [ ] **Fix** - Bug fixes - [ ] **Remove** - Removed features or deprecated functionality - [ ] **Internal** - Internal changes (refactoring, tests, docs, etc.) ## Breaking Changes <!-- If checked, describe the breaking changes and migration steps --> <!-- Breaking changes are not generally permitted, please discuss on a GitHub discussion or with the development team if you believe you need to break a backward compatibility guarantee --> - [ ] **This PR contains breaking changes** ## Testing <!-- How was this tested? Check all that apply --> - [ ] Unit tests added/updated - [ ] Integration tests added/updated - [ ] Manual testing performed - [ ] No testing required (docs, internal refactor, etc.) ## Additional Notes <!-- Any additional context, deployment notes, or reviewer guidance -->
1 parent d5e5b61 commit 5a93f8a

14 files changed

Lines changed: 19 additions & 20 deletions

.github/actions/setup-mkosi-environment/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ inputs:
44
rust-version:
55
description: 'Rust toolchain version to install'
66
required: false
7-
default: '1.90.0'
7+
default: '1.96.0'
88
arch:
99
description: 'Target architecture (x86_64 or aarch64)'
1010
required: false

.github/workflows/build-boot-artifacts.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ jobs:
140140
if: inputs.build_type == 'ephemeral'
141141
uses: ./.github/actions/setup-mkosi-environment
142142
with:
143-
rust-version: '1.90.0'
143+
rust-version: '1.96.0'
144144
arch: ${{ inputs.arch }}
145145

146146
# Setup Docker for container-based builds

Makefile.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ BUILD_CONTAINER_AARCH64_URL = { value = "urm.nvidia.com/swngc-ngcc-docker-local/
4646
#
4747
# Make sure to update the RUST_NIGHTLY variable in
4848
# dev/docker/Dockerfile.build-container-x86_64 if you change this.
49-
RUST_NIGHTLY = "nightly-2026-05-27"
49+
RUST_NIGHTLY = "nightly-2026-06-16"
5050

5151
[tasks.book]
5252
workspace = false
@@ -203,7 +203,7 @@ echo "Image carbide-build-x86_64 built. Run: cargo make cargo-docker -- build -p
203203

204204
[tasks.build-cargo-docker-image-minimal]
205205
category = "Build"
206-
description = "Build minimal Cargo Docker image (Rust 1.90 + protoc). Quick (~2-5 min). Required once before cargo-docker-minimal for workspace builds (e.g. carbide-rpc)."
206+
description = "Build minimal Cargo Docker image (Rust 1.96 + protoc). Quick (~2-5 min). Required once before cargo-docker-minimal for workspace builds (e.g. carbide-rpc)."
207207
workspace = false
208208
script = '''
209209
set -e
@@ -213,7 +213,7 @@ echo "Image carbide-build-minimal built. Run: cargo make cargo-docker-minimal --
213213

214214
[tasks.build-pxe-build-container]
215215
category = "Build"
216-
description = "Build the PXE artifact build container image (Ubuntu 24.04 + Rust 1.90 + mkosi deps). Required once before pxe-docker-x86."
216+
description = "Build the PXE artifact build container image (Ubuntu 24.04 + Rust 1.96 + mkosi deps). Required once before pxe-docker-x86."
217217
workspace = false
218218
script = '''
219219
set -e
@@ -301,7 +301,7 @@ fi
301301

302302
[tasks.cargo-docker-minimal]
303303
category = "Build"
304-
description = "Run Cargo in minimal Linux image (Rust 1.90 + protoc). Requires build-cargo-docker-image-minimal once (~2-5 min). For DB tests set DATABASE_URL (use host.docker.internal, not localhost). Runs as root and chowns /code afterward so target/ stays writable on macOS/Colima."
304+
description = "Run Cargo in minimal Linux image (Rust 1.96 + protoc). Requires build-cargo-docker-image-minimal once (~2-5 min). For DB tests set DATABASE_URL (use host.docker.internal, not localhost). Runs as root and chowns /code afterward so target/ stays writable on macOS/Colima."
305305
workspace = false
306306
dependencies = ["check-cargo-home-set"]
307307
script = '''

crates/bmc-proxy/src/setup.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,6 @@ pub fn dep_log_filter(env_filter: EnvFilter) -> EnvFilter {
8989
#[cfg(test)]
9090
mod tests {
9191
use carbide_test_support::value_scenarios;
92-
use tracing_subscriber::prelude::*;
9392

9493
use super::*;
9594

crates/dpf/dev/Dockerfile.carbide-dpf-api-harness-glibc2.34

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ RUN apt-get update && \
3030
libssl-dev \
3131
ca-certificates \
3232
git \
33-
&& curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain 1.95.0 \
33+
&& curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain 1.96.0 \
3434
&& apt-get clean \
3535
&& rm -rf /var/lib/apt/lists/*
3636

dev/docker/Dockerfile.build-artifacts-container-aarch64

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
# See the License for the specific language governing permissions and
1515
# limitations under the License.
1616
#
17-
FROM arm64v8/rust:1.95.0-slim-bullseye
17+
FROM arm64v8/rust:1.96.0-slim-bullseye
1818

1919
# Set in gitlab-templates/scripts/build-push-container-image.sh
2020
ARG CI_COMMIT_SHORT_SHA

dev/docker/Dockerfile.build-artifacts-container-cross-aarch64

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
# Note that the output container image needs to be able to produce artifacts
1717
# that are compatible with the DPU BFB, so for example the libc6 version can't
1818
# be greater than what we see in the BFB.
19-
FROM rust:1.95.0-bookworm
19+
FROM rust:1.96.0-bookworm
2020

2121
RUN dpkg --add-architecture arm64 && \
2222
apt-get update && \

dev/docker/Dockerfile.build-artifacts-container-x86_64

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
# - `docker push urm.nvidia.com/swngc-ngcc-docker-local/forge/carbide/x86-64/build-container:{OUTPUT_OF_GIT_DESCRIBE_HERE}`
2727

2828
# This should match rust-toolchain.toml
29-
FROM rust:1.95.0-slim-bullseye
29+
FROM rust:1.96.0-slim-bullseye
3030

3131
# Set in gitlab-templates/scripts/build-push-container-image.sh
3232
ARG CI_COMMIT_SHORT_SHA

dev/docker/Dockerfile.build-container-aarch64

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
# See the License for the specific language governing permissions and
1515
# limitations under the License.
1616
#
17-
FROM arm64v8/rust:1.95.0-slim-bookworm
17+
FROM arm64v8/rust:1.96.0-slim-bookworm
1818

1919
# Set in gitlab-templates/scripts/build-push-container-image.sh
2020
ARG CI_COMMIT_SHORT_SHA

dev/docker/Dockerfile.build-container-x86_64

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@
1616
#
1717

1818
# This should match rust-toolchain.toml
19-
FROM rust:1.95.0-slim-bookworm
19+
FROM rust:1.96.0-slim-bookworm
2020

2121
# Set in gitlab-templates/scripts/build-push-container-image.sh
2222
ARG CI_COMMIT_SHORT_SHA
2323
ENV CI_COMMIT_SHORT_SHA $CI_COMMIT_SHORT_SHA
24-
ENV RUST_NIGHTLY nightly-2026-05-27
24+
ENV RUST_NIGHTLY nightly-2026-06-16
2525

2626
# Change CACHEKEY to whatever so docker doesn't re-use the cache from before if you want apt to actually run.
2727
#

0 commit comments

Comments
 (0)