diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 06298af1..9527cd5f 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -88,7 +88,7 @@ USER ubuntu ARG RUSTUP_VERSION=1.29.1 ARG RUSTUP_SHA256_ARM64=15f6e4ce9f583b929c996c91562bad6d4454f3281de858b02cdfdef615fac433 ARG RUSTUP_SHA256_AMD64=dda7234360b7f578ca8b0ddcb80145646fa61a67c1720a5abc7051b35c9fcb71 -ENV RUST_VERSION=1.98.1 \ +ENV RUST_VERSION=1.99.1 \ CARGO_HOME=/home/ubuntu/.cargo \ RUSTUP_HOME=/home/ubuntu/.rustup ENV PATH=${CARGO_HOME}/bin:${PATH} diff --git a/CLAUDE.md b/CLAUDE.md index ad2761f9..5dfe782e 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -10,7 +10,7 @@ The planner is written in Rust, in `rust/` (core logic in `rust/planner`). The s ## Prerequisites -- **Rust, through rustup.** `rust/rust-toolchain.toml` pins the toolchain (1.98.1, with rustfmt, clippy and the `wasm32-unknown-unknown` target). Inside `rust/`, rustup reads that file and installs the pin on first use, so there is nothing to choose. The pin is deliberate: the planner's whole job is exact, repeatable output, and a compiler change is a codegen change. +- **Rust, through rustup.** `rust/rust-toolchain.toml` pins the toolchain (1.99.1, with rustfmt, clippy and the `wasm32-unknown-unknown` target). Inside `rust/`, rustup reads that file and installs the pin on first use, so there is nothing to choose. The pin is deliberate: the planner's whole job is exact, repeatable output, and a compiler change is a codegen change. - **Node 24 (Active LTS) and npm** for the front-end in `src/vue`. It uses npm, not pnpm: `package-lock.json` is the lockfile, and CI deploys with the `wrangler` pinned there. - That is all for building and testing. There are no submodules and no .NET. `python3` and a real Factorio install are needed only to capture the Factorio oracle (see below). @@ -56,7 +56,7 @@ CI (`.github/workflows/ci.yml`) runs the five Rust check and build commands abov ### Devcontainer -`.devcontainer/` builds a Linux container carrying every toolchain this repo needs: **Rust 1.98.1 through rustup (with rustfmt, clippy, rust-src and the wasm32 target), Node 24.21.0, python3, git and gcc** (cargo's linker), on plain `ubuntu:24.04` pinned by digest. Node is pinned exactly and checksummed. The base already has user `ubuntu` at uid 1000, which is the container's `remoteUser`. Before stage 13b the image was built on the .NET SDK and also carried dotnet, PowerShell and Lua 5.2; those are gone with the C#. +`.devcontainer/` builds a Linux container carrying every toolchain this repo needs: **Rust 1.99.1 through rustup (with rustfmt, clippy, rust-src and the wasm32 target), Node 24.21.0, python3, git and gcc** (cargo's linker), on plain `ubuntu:24.04` pinned by digest. Node is pinned exactly and checksummed. The base already has user `ubuntu` at uid 1000, which is the container's `remoteUser`. Before stage 13b the image was built on the .NET SDK and also carried dotnet, PowerShell and Lua 5.2; those are gone with the C#. **Rust is pre-installed, and `rust/rust-toolchain.toml` still decides.** The image installs the toolchain named by `RUST_VERSION` in the Dockerfile, so creating the container downloads no compiler. Inside `rust/`, rustup reads the toolchain file as it does anywhere else. A stale `RUST_VERSION` therefore breaks nothing - rustup just installs the new pin on first use (about 10 s, measured) - which is exactly why nobody would notice. So the Devcontainer CI job compares `RUST_VERSION` with the toolchain file, checks that `rustc` and `cargo` in `rust/` report that version, and checks that the wasm32 target is installed. **When `rust/rust-toolchain.toml` moves, move `RUST_VERSION` with it.** The toolchain file is in that job's paths filter for this reason. diff --git a/rust/rust-toolchain.toml b/rust/rust-toolchain.toml index 0e340dc9..f4200a23 100644 --- a/rust/rust-toolchain.toml +++ b/rust/rust-toolchain.toml @@ -2,7 +2,7 @@ # whole job is identical output, and a compiler change is a codegen change, so a # contributor's rustup default must not decide which compiler runs. [toolchain] -channel = "1.98.1" +channel = "1.99.1" components = ["rustfmt", "clippy"] targets = ["wasm32-unknown-unknown"] profile = "minimal"