From fab7fa65589c4083a7f9db5049344ca054ed4f3b Mon Sep 17 00:00:00 2001 From: Sam Day Date: Tue, 17 Feb 2026 06:37:17 +1000 Subject: [PATCH 1/2] ci: pull rust toolchain setup out of container image Signed-off-by: Sam Day Assisted-by: opencode:gpt-5.3-codex --- .github/Dockerfile | 9 --------- .github/workflows/build.yml | 2 ++ 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/.github/Dockerfile b/.github/Dockerfile index c04e5f09..707da520 100644 --- a/.github/Dockerfile +++ b/.github/Dockerfile @@ -8,17 +8,12 @@ ARG PHOSH_REF=v0.51.0 ARG PHOC_REMOTE=https://gitlab.gnome.org/World/Phosh/phoc.git ARG PHOC_REF=v0.51.0 -ENV RUSTUP_HOME=/usr/local/rustup \ - CARGO_HOME=/usr/local/cargo \ - PATH=/usr/local/cargo/bin:$PATH - RUN export DEBIAN_FRONTEND=noninteractive \ && apt-get -y update \ && apt-get -y install --no-install-recommends \ curl \ dh-cargo \ foot \ - rust-clippy \ wf-recorder \ && eatmydata git clone ${PHOC_REMOTE} \ && cd phoc \ @@ -32,10 +27,6 @@ RUN export DEBIAN_FRONTEND=noninteractive \ && cd phosh \ && git checkout ${PHOSH_REF} \ && eatmydata apt-get --no-install-recommends -y build-dep . \ - && curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs \ - | sh -s -- -y --no-modify-path --profile minimal --default-toolchain 1.85.0 \ - && rustup component add clippy rustfmt --toolchain 1.85.0 \ - && chmod -R a+rX /usr/local/rustup /usr/local/cargo \ && eatmydata meson setup --prefix=/usr -Dbindings-lib=true _build . \ && eatmydata meson compile -C _build \ && eatmydata meson install -C _build \ diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ed8654dc..9f07eedd 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -56,6 +56,8 @@ jobs: - uses: actions/checkout@v4 with: ref: ${{ github.event.pull_request.head.sha }} + - name: Set up Rust toolchain + uses: actions-rust-lang/setup-rust-toolchain@v1 - name: Build run: | set -uexo pipefail From 575149a76bf8e3bd8bc09e3ce508777d60bdbafe Mon Sep 17 00:00:00 2001 From: Sam Day Date: Tue, 17 Feb 2026 09:19:05 +1000 Subject: [PATCH 2/2] tests: fix lint Signed-off-by: Sam Day Assisted-by: opencode:gpt-5.3-codex --- tests/common/dbus.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/common/dbus.rs b/tests/common/dbus.rs index 9909fa83..8a815222 100644 --- a/tests/common/dbus.rs +++ b/tests/common/dbus.rs @@ -65,7 +65,7 @@ struct UserFixture { #[zbus::interface(name = "org.freedesktop.Accounts")] impl AccountsFixture { - async fn list_cached_users(&self) -> Vec { + async fn list_cached_users(&self) -> Vec> { let mut users = vec![ ObjectPath::from_static_str_unchecked("/org/freedesktop/Accounts/phoshi"), ObjectPath::from_static_str_unchecked("/org/freedesktop/Accounts/agx"),