Skip to content

Commit

Permalink
treewide: Bump libphosh to 0.0.5, run CI build against libphosh v0.44…
Browse files Browse the repository at this point in the history
….0 + patched phoc
  • Loading branch information
samcday committed Jan 1, 2025
1 parent 1b3de00 commit df3f190
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 9 deletions.
22 changes: 19 additions & 3 deletions .github/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,33 @@

FROM registry.gitlab.gnome.org/world/phosh/phosh/debian:v0.0.2024-11-04

ARG PHOSH_TAG=v0.43.1
ARG PHOSH_REMOTE=https://gitlab.gnome.org/World/Phosh/phosh.git
ARG PHOSH_REF=v0.44.0

# Workaround for https://gitlab.gnome.org/World/Phosh/phosh/-/issues/1161
# Official upstream can be used when phoc 0.45 is released
#ARG PHOC_REMOTE=https://gitlab.gnome.org/World/Phosh/phoc.git
ARG PHOC_REMOTE=https://gitlab.gnome.org/guidog/phoc.git
ARG PHOC_REF=05f9cfbe4c4c0e74732d8817e1e2959053d40e6d

RUN export DEBIAN_FRONTEND=noninteractive \
&& apt-get -y update \
&& apt-get -y install --no-install-recommends \
dh-cargo \
rust-clippy \
wf-recorder \
&& eatmydata git clone -b ${PHOSH_TAG} https://gitlab.gnome.org/World/Phosh/phosh.git \
&& eatmydata git clone ${PHOC_REMOTE} \
&& cd phoc \
&& git checkout ${PHOC_REF} \
&& DEB_BUILD_PROFILES=pkg.phoc.embedwlroots eatmydata apt-get --no-install-recommends -y build-dep . \
&& eatmydata meson setup --prefix=/usr -Dembed-wlroots=enabled _build . \
&& eatmydata meson compile -C _build \
&& eatmydata meson install -C _build \
&& cd .. \
&& eatmydata git clone ${PHOSH_REMOTE} \
&& cd phosh \
&& eatmydata apt-get -y build-dep . \
&& git checkout ${PHOSH_REF} \
&& eatmydata apt-get --no-install-recommends -y build-dep . \
&& eatmydata meson setup --prefix=/usr -Dbindings-lib=true _build . \
&& eatmydata meson compile -C _build \
&& eatmydata meson install -C _build \
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ concurrency:
env:
CARGO_TERM_COLOR: always
RUSTFLAGS: "-Dwarnings"
PHOSH_TAG: v0.43.1

permissions:
contents: write
Expand Down
8 changes: 4 additions & 4 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ glob = "0.3.1"
greetd_ipc = { version = "0.10.0", features = ["sync-codec"] }
async-channel = "2.2.1"
anyhow = "1.0.82"
libphosh = "0.0.4"
libphosh = "0.0.5"
clap = { version = "4.5.4", features = ["derive"] }
wayland-client = "0.31"
zbus = { version = "4", default-features = false, features = ["blocking", "async-io"] }
Expand Down

0 comments on commit df3f190

Please sign in to comment.