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/workflows/runtime-exec-e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:
- name: Set up Rust (pinned by rust-toolchain.toml)
uses: dtolnay/rust-toolchain@stable
with:
toolchain: "1.93"
toolchain: "1.94"

- name: Cache cargo
uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/sdlc-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ jobs:
uses: dtolnay/rust-toolchain@stable
with:
# rust-toolchain.toml at repo root pins channel + clippy component
toolchain: "1.93"
toolchain: "1.94"
components: clippy, rustfmt

# Formatting ran BEFORE clippy: it needs no protoc and no build, so a
Expand Down
4 changes: 2 additions & 2 deletions rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Pin the Rust toolchain for reproducible builds across dev, CI, and the
# Docker images (services/*/Dockerfile use rust:1.93-slim). The codebase uses
# Docker images (services/*/Dockerfile use rust:1.94-slim). The codebase uses
# edition 2024, which requires Rust >= 1.85.
[toolchain]
channel = "1.93"
channel = "1.94"
components = ["rustfmt", "clippy"]
2 changes: 1 addition & 1 deletion services/gateway/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM rust:1.93-slim AS builder
FROM rust:1.94-slim AS builder
# openssl-sys needs the system OpenSSL headers + pkg-config to compile.
RUN apt-get update && apt-get install -y --no-install-recommends pkg-config libssl-dev && rm -rf /var/lib/apt/lists/*
WORKDIR /app
Expand Down
6 changes: 6 additions & 0 deletions services/harness/src/exec.rs
Original file line number Diff line number Diff line change
Expand Up @@ -586,6 +586,12 @@ pub async fn run(vm_id: String, manager: ManagerClient) -> Result<()> {
.add_service(
pb::runtime_harness_server::RuntimeHarnessServer::with_interceptor(
svc,
// clippy::result_large_err (tightened in Rust 1.94) flags the
// 176-byte `tonic::Status` here. Both halves of that signature
// are tonic's, not ours: `Interceptor` requires exactly
// `FnMut(Request<()>) -> Result<Request<()>, Status>`, so the
// error cannot be boxed without failing to implement the trait.
#[allow(clippy::result_large_err)]
move |req: tonic::Request<()>| check_bearer_token(req, &token_for_interceptor),
),
)
Expand Down
2 changes: 1 addition & 1 deletion services/model-router/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM rust:1.93-slim AS builder
FROM rust:1.94-slim AS builder
# openssl-sys needs the system OpenSSL headers + pkg-config to compile.
RUN apt-get update && apt-get install -y --no-install-recommends pkg-config libssl-dev && rm -rf /var/lib/apt/lists/*
WORKDIR /app
Expand Down
Loading
Loading