Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 .github/actions/setup-mkosi-environment/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ inputs:
rust-version:
description: 'Rust toolchain version to install'
required: false
default: '1.90.0'
default: '1.96.0'
arch:
description: 'Target architecture (x86_64 or aarch64)'
required: false
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-boot-artifacts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ jobs:
if: inputs.build_type == 'ephemeral'
uses: ./.github/actions/setup-mkosi-environment
with:
rust-version: '1.90.0'
rust-version: '1.96.0'
arch: ${{ inputs.arch }}

# Setup Docker for container-based builds
Expand Down
8 changes: 4 additions & 4 deletions Makefile.toml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ BUILD_CONTAINER_AARCH64_URL = { value = "urm.nvidia.com/swngc-ngcc-docker-local/
#
# Make sure to update the RUST_NIGHTLY variable in
# dev/docker/Dockerfile.build-container-x86_64 if you change this.
RUST_NIGHTLY = "nightly-2026-05-27"
RUST_NIGHTLY = "nightly-2026-06-16"

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

[tasks.build-cargo-docker-image-minimal]
category = "Build"
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)."
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)."
workspace = false
script = '''
set -e
Expand All @@ -213,7 +213,7 @@ echo "Image carbide-build-minimal built. Run: cargo make cargo-docker-minimal --

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

[tasks.cargo-docker-minimal]
category = "Build"
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."
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."
workspace = false
dependencies = ["check-cargo-home-set"]
script = '''
Expand Down
1 change: 0 additions & 1 deletion crates/bmc-proxy/src/setup.rs
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,6 @@ pub fn dep_log_filter(env_filter: EnvFilter) -> EnvFilter {
#[cfg(test)]
mod tests {
use carbide_test_support::value_scenarios;
use tracing_subscriber::prelude::*;

use super::*;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ RUN apt-get update && \
libssl-dev \
ca-certificates \
git \
&& curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain 1.95.0 \
&& curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain 1.96.0 \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*

Expand Down
2 changes: 1 addition & 1 deletion dev/docker/Dockerfile.build-artifacts-container-aarch64
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
FROM arm64v8/rust:1.95.0-slim-bullseye
FROM arm64v8/rust:1.96.0-slim-bullseye

# Set in gitlab-templates/scripts/build-push-container-image.sh
ARG CI_COMMIT_SHORT_SHA
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
# Note that the output container image needs to be able to produce artifacts
# that are compatible with the DPU BFB, so for example the libc6 version can't
# be greater than what we see in the BFB.
FROM rust:1.95.0-bookworm
FROM rust:1.96.0-bookworm

RUN dpkg --add-architecture arm64 && \
apt-get update && \
Expand Down
2 changes: 1 addition & 1 deletion dev/docker/Dockerfile.build-artifacts-container-x86_64
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
# - `docker push urm.nvidia.com/swngc-ngcc-docker-local/forge/carbide/x86-64/build-container:{OUTPUT_OF_GIT_DESCRIBE_HERE}`

# This should match rust-toolchain.toml
FROM rust:1.95.0-slim-bullseye
FROM rust:1.96.0-slim-bullseye

# Set in gitlab-templates/scripts/build-push-container-image.sh
ARG CI_COMMIT_SHORT_SHA
Expand Down
2 changes: 1 addition & 1 deletion dev/docker/Dockerfile.build-container-aarch64
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
FROM arm64v8/rust:1.95.0-slim-bookworm
FROM arm64v8/rust:1.96.0-slim-bookworm

# Set in gitlab-templates/scripts/build-push-container-image.sh
ARG CI_COMMIT_SHORT_SHA
Expand Down
4 changes: 2 additions & 2 deletions dev/docker/Dockerfile.build-container-x86_64
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@
#

# This should match rust-toolchain.toml
FROM rust:1.95.0-slim-bookworm
FROM rust:1.96.0-slim-bookworm

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

# Change CACHEKEY to whatever so docker doesn't re-use the cache from before if you want apt to actually run.
#
Expand Down
4 changes: 2 additions & 2 deletions dev/docker/Dockerfile.cargo-docker-minimal
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@
#
# Minimal image for running Cargo via Docker on macOS.
# Adds protoc (carbide-rpc), libpq, and sccache for faster repeat builds.
# Matches rust-toolchain.toml (Rust 1.90).
# Matches rust-toolchain.toml (Rust 1.96).
#
# On Apple Silicon (M1/M2/M3): do not set --platform=linux/amd64. Building on
# arm64 produces a native image; use Colima with enough CPU/memory and virtiofs (see docs).
#
FROM rust:1.95.0-slim-bookworm
FROM rust:1.96.0-slim-bookworm

RUN apt-get update && \
DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
Expand Down
2 changes: 1 addition & 1 deletion dev/docker/Dockerfile.pxe-build-container
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
#
FROM ubuntu:24.04

ARG RUST_VERSION=1.95.0
ARG RUST_VERSION=1.96.0

RUN apt-get update && \
DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
Expand Down
2 changes: 1 addition & 1 deletion lints/carbide-lints/rust-toolchain.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@
# limitations under the License.
#
[toolchain]
channel = "nightly-2026-05-27"
channel = "nightly-2026-06-16"
4 changes: 2 additions & 2 deletions rust-toolchain.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@
# limitations under the License.
#
[toolchain]
# If you change this grep for "FROM.*rust:1.95.0" and update those Dockerfiles
channel = "1.95.0"
# If you change this grep for "FROM.*rust:1.96.0" and update those Dockerfiles
channel = "1.96.0"
Loading