From 19af4cc7686c51c1cf0febfaebc2b95539724293 Mon Sep 17 00:00:00 2001 From: Sirius DevOps Date: Thu, 10 Sep 2026 13:14:55 -0400 Subject: [PATCH] =?UTF-8?q?ci:=20build=20on=20rust=201.91=20=E2=80=94=20th?= =?UTF-8?q?e=20locked=20Arti=200.46=20crates=20require=20rustc=20>=3D=201.?= =?UTF-8?q?91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The rust:1.87-bookworm job image failed every builder step with 'tor-*@0.46.0 requires rustc 1.91 ... either upgrade rustc or select compatible dependency versions'. Cargo.toml declared rust-version 1.87, which was simply wrong: cargo 1.87 could not even resolve the lockfile. - rust-version 1.87 -> 1.91 (README requirement text too) - RUST_IMAGE rust:1.87-bookworm -> rust:1.91-bookworm in ci and release --- .forgejo/workflows/ci.yml | 2 +- .forgejo/workflows/release.yml | 2 +- Cargo.toml | 2 +- README.md | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.forgejo/workflows/ci.yml b/.forgejo/workflows/ci.yml index fd99014..c16e1c4 100644 --- a/.forgejo/workflows/ci.yml +++ b/.forgejo/workflows/ci.yml @@ -10,7 +10,7 @@ on: env: CARGO_TERM_COLOR: never - RUST_IMAGE: rust:1.87-bookworm + RUST_IMAGE: rust:1.91-bookworm CARGO_REGISTRY_VOLUME: onionwire-cargo-registry CARGO_TARGET_VOLUME: onionwire-target-ci BUILD_CONTAINER: onionwire-ci diff --git a/.forgejo/workflows/release.yml b/.forgejo/workflows/release.yml index 90d70ed..ce85219 100644 --- a/.forgejo/workflows/release.yml +++ b/.forgejo/workflows/release.yml @@ -19,7 +19,7 @@ env: TARGET: aarch64-unknown-linux-gnu # Job steps run inside node:20-bullseye (the runner's docker label image) with # the host docker socket mounted, so builds happen in a sibling rust container. - RUST_IMAGE: rust:1.87-bookworm + RUST_IMAGE: rust:1.91-bookworm CARGO_REGISTRY_VOLUME: onionwire-cargo-registry CARGO_TARGET_VOLUME: onionwire-target-aarch64 BUILD_CONTAINER: onionwire-release-build diff --git a/Cargo.toml b/Cargo.toml index 7214959..eaded20 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -2,7 +2,7 @@ name = "onionwire" version = "0.1.2" edition = "2024" -rust-version = "1.87" +rust-version = "1.91" description = "Lean Tor messenger: Arti in-process, identity=pubkey, onion=locator. No XMPP." license = "MIT" publish = false diff --git a/README.md b/README.md index 1feaddc..5fd576c 100644 --- a/README.md +++ b/README.md @@ -58,13 +58,13 @@ Checksum files are `sha256sum` format (` onionwire-`). Download b ### Option B — build from source -Needs [Rust](https://rustup.rs/) **1.87+** (`edition = "2024"`). A distro `rustc` is fine if `rustc --version` reports 1.87 or newer. Do not install `tor` for this app. +Needs [Rust](https://rustup.rs/) **1.91+** (`edition = "2024"`; the pinned Arti 0.46 crates require rustc 1.91). A distro `rustc` is fine if `rustc --version` reports 1.91 or newer. Do not install `tor` for this app. ```bash # rustup (if you do not already have cargo) curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh source "$HOME/.cargo/env" -rustc --version # must be 1.87 or newer +rustc --version # must be 1.91 or newer ``` ```bash @@ -203,7 +203,7 @@ FORGEJO_TOKEN= scripts/build-release-local.sh vX.Y.Z ``` Workflows (Forgejo Actions, `.forgejo/workflows/` — jobs run on the `docker` -label of the Pi runner and do their Rust work in a `rust:1.87-bookworm` +label of the Pi runner and do their Rust work in a `rust:1.91-bookworm` sibling container): - [`.forgejo/workflows/ci.yml`](.forgejo/workflows/ci.yml) — `cargo test --locked` + `cargo clippy --all-targets -- -D warnings` on `main` and PRs (ignored Tor-live tests are not run).