From 33ccc62a1716ef3babe2fefbd87120720bfc51ed Mon Sep 17 00:00:00 2001 From: Andy Holmes Date: Tue, 19 Sep 2023 17:53:30 -0700 Subject: [PATCH] ci: add libpeas-2 to the Dockerfile libpeas-2 is not available in `fedora:39`, and fussing with a subproject is not really worth the trouble at this point. Add build and install the dependency in the CI, so test can be run until its available or someone reports it as a necessity. --- build-aux/docker/Dockerfile | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/build-aux/docker/Dockerfile b/build-aux/docker/Dockerfile index b0ca5e4813..60078762c1 100644 --- a/build-aux/docker/Dockerfile +++ b/build-aux/docker/Dockerfile @@ -24,6 +24,20 @@ RUN dnf install -y --enablerepo=fedora-debuginfo,updates-debuginfo \ sqlite-devel sqlite-debuginfo && \ dnf clean all && rm -rf /var/cache/dnf +# Build libpeas-2, until it's available in Fedora +RUN git clone https://gitlab.gnome.org/GNOME/libpeas.git \ + --branch main \ + --single-branch && \ + cd libpeas && \ + meson setup --prefix=/usr \ + -Dgjs=false \ + -Dlua51=false \ + -Dpython3=false \ + -Dintrospection=true \ + -Dvapi=true \ + _build && \ + meson install -C _build + # Build libwalbottle from source, since it's not available in most repositories RUN git clone https://gitlab.com/walbottle/walbottle.git \ --branch main \