From 7fe04a7122c5c07b5800d48d93d011d6b9618fed Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 3 May 2023 18:49:45 -0400 Subject: [PATCH] ci: Add pipewire to the image And its buddy, wireplumber. But we don't need gnome-desktop-testing anymore, now that installed tests are gone. --- .gitlab-ci.yml | 2 +- .gitlab-ci/fedora.Dockerfile | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3de045ee5f..6872748a07 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -26,7 +26,7 @@ variables: BACKEND_FLAGS: "-Dx11-backend=true -Dwayland-backend=true -Dbroadway-backend=true" FEATURE_FLAGS: "-Dvulkan=enabled -Dcloudproviders=enabled -Ddemos=false -Dbuild-examples=false -Dbuild-tests=false -Dbuild-testsuite=true" MESON_TEST_TIMEOUT_MULTIPLIER: 3 - FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora:v43" + FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora:v44" workflow: rules: diff --git a/.gitlab-ci/fedora.Dockerfile b/.gitlab-ci/fedora.Dockerfile index 8425dbc0b9..954d5072bf 100644 --- a/.gitlab-ci/fedora.Dockerfile +++ b/.gitlab-ci/fedora.Dockerfile @@ -32,7 +32,6 @@ RUN dnf -y install \ glib2-static \ glibc-devel \ glibc-headers \ - gnome-desktop-testing \ gnupg2 \ gobject-introspection-devel \ graphene-devel \ @@ -78,6 +77,7 @@ RUN dnf -y install \ pango-devel \ pcre-devel \ pcre-static \ + pipewire \ python3 \ python3-docutils \ python3-gobject \ @@ -97,6 +97,7 @@ RUN dnf -y install \ weston \ weston-libs \ which \ + wireplumber \ xorg-x11-server-Xvfb \ && dnf clean all -- 2.30.2