From d5a3a296d9e0cf95dda3e3daf45916d52b371408 Mon Sep 17 00:00:00 2001 From: Lochnair Date: Wed, 28 Oct 2026 13:49:40 +0000 Subject: [PATCH 1/3] fix(ci): install prerequisites on Gitea runners --- .gitea/workflows/ci.yml | 14 +++++++++++++- .gitea/workflows/supply-chain.yml | 10 ++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml index 28b92cd..ab2d395 100644 --- a/.gitea/workflows/ci.yml +++ b/.gitea/workflows/ci.yml @@ -44,6 +44,10 @@ jobs: with: components: clippy cache: false + - name: Install UCI build dependencies + run: | + sudo apt-get update + sudo apt-get install -y --no-install-recommends build-essential cmake libclang-dev pkg-config - name: Run clippy with all features run: cargo clippy --workspace --all-targets --all-features --locked -- -D warnings - name: Run clippy without default features @@ -74,11 +78,15 @@ jobs: uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7 with: persist-credentials: false + - name: Install UCI build dependencies + run: | + sudo apt-get update + sudo apt-get install -y --no-install-recommends build-essential cmake libclang-dev pkg-config - name: Install musl toolchain if: matrix.musl run: | sudo apt-get update - sudo apt-get install --no-install-recommends musl-tools + sudo apt-get install -y --no-install-recommends musl-tools - name: Install Rust toolchain uses: actions-rust-lang/setup-rust-toolchain@ecabd13d1c56bd1345c230e542e9144811ad706f # v2 with: @@ -104,6 +112,10 @@ jobs: uses: actions-rust-lang/setup-rust-toolchain@ecabd13d1c56bd1345c230e542e9144811ad706f # v2 with: cache: false + - name: Install UCI build dependencies + run: | + sudo apt-get update + sudo apt-get install -y --no-install-recommends build-essential cmake libclang-dev pkg-config - name: Check documentation run: cargo doc --workspace --all-features --no-deps --locked - name: Run doctests diff --git a/.gitea/workflows/supply-chain.yml b/.gitea/workflows/supply-chain.yml index 4a38320..30ddb55 100644 --- a/.gitea/workflows/supply-chain.yml +++ b/.gitea/workflows/supply-chain.yml @@ -35,6 +35,10 @@ jobs: uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7 with: persist-credentials: false + - name: Install Rust toolchain + uses: actions-rust-lang/setup-rust-toolchain@ecabd13d1c56bd1345c230e542e9144811ad706f # v2 + with: + cache: false - name: Install cargo-deny run: cargo install cargo-deny --version "${CARGO_DENY_VERSION}" --locked - name: Run cargo-deny @@ -49,6 +53,12 @@ jobs: uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7 with: persist-credentials: false + - name: Install Go toolchain + uses: actions/setup-go@924ae3a1cded613372ab5595356fb5720e22ba16 # v6 + with: + go-version: stable + cache: false + token: '' - name: Install actionlint run: go install "github.com/rhysd/actionlint/cmd/actionlint@v${ACTIONLINT_VERSION}" - name: Check workflow syntax -- 2.54.0 From e42d424e9f2396d14bbea904fcaaea605494e562 Mon Sep 17 00:00:00 2001 From: Lochnair Date: Wed, 28 Oct 2026 13:54:48 +0000 Subject: [PATCH 2/3] fix(ci): resolve Clippy errors exposed by restored builds --- src/controller.rs | 4 ++++ src/ratecontroller.rs | 4 ++++ src/reflector_selector.rs | 2 +- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/controller.rs b/src/controller.rs index 1573c13..4572985 100644 --- a/src/controller.rs +++ b/src/controller.rs @@ -42,6 +42,10 @@ pub struct Controller { } impl Controller { + #[allow( + clippy::too_many_arguments, + reason = "Constructor wires the controller channels and shared stream state" + )] pub fn new( reflector_rx: Receiver>, icmp_binding_tx: Sender>, diff --git a/src/ratecontroller.rs b/src/ratecontroller.rs index d35e205..867e299 100644 --- a/src/ratecontroller.rs +++ b/src/ratecontroller.rs @@ -150,6 +150,10 @@ pub struct Ratecontroller { } impl Ratecontroller { + #[allow( + clippy::too_many_arguments, + reason = "Constructor injects independent runtime and test backends" + )] fn new_with_backends( settings: Settings, control_snapshot_rx: Receiver, diff --git a/src/reflector_selector.rs b/src/reflector_selector.rs index 3cbbc89..e1993a6 100644 --- a/src/reflector_selector.rs +++ b/src/reflector_selector.rs @@ -235,7 +235,7 @@ impl ReflectorSelector { } // Sort the candidates table now by ascending RTT - candidates.sort_by(|a, b| a.1.cmp(&b.1)); + candidates.sort_by_key(|candidate| candidate.1); // Now we will just limit the candidates down to 2 * num_reflectors let num_reflectors = self.settings.reflectors.num_reflectors; -- 2.54.0 From cab50ed38de0bee732a3631a640b4ad8a0ab63b1 Mon Sep 17 00:00:00 2001 From: Lochnair Date: Wed, 28 Oct 2026 13:56:53 +0000 Subject: [PATCH 3/3] fix(ci): resolve dependency advisory and workspace license metadata --- Cargo.lock | 4 ++-- crates/uci-derive/Cargo.toml | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2dde489..04ff6cc 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -188,9 +188,9 @@ dependencies = [ [[package]] name = "ctutils" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03bb0e1cc970d482d121d9a1744999169b69a07470b3d644a7894e53fcaf4574" +checksum = "12218662ccac37d9714f2191252553d67585b97df8c839cbe49e0bde278dc865" dependencies = [ "cmov", ] diff --git a/crates/uci-derive/Cargo.toml b/crates/uci-derive/Cargo.toml index ca7ed88..6352c22 100644 --- a/crates/uci-derive/Cargo.toml +++ b/crates/uci-derive/Cargo.toml @@ -3,6 +3,7 @@ name = "uci-derive" version = "0.1.0" edition = "2024" publish = false +license = "MPL-2.0" [lib] proc-macro = true -- 2.54.0