Skip to content
Open
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
9 changes: 0 additions & 9 deletions .github/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -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 \
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/common/dbus.rs
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ struct UserFixture {

#[zbus::interface(name = "org.freedesktop.Accounts")]
impl AccountsFixture {
async fn list_cached_users(&self) -> Vec<ObjectPath> {
async fn list_cached_users(&self) -> Vec<ObjectPath<'_>> {
let mut users = vec![
ObjectPath::from_static_str_unchecked("/org/freedesktop/Accounts/phoshi"),
ObjectPath::from_static_str_unchecked("/org/freedesktop/Accounts/agx"),
Expand Down
Loading