From adc43ba001e533d8f09d07faf7ca474fd9c9ecd4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= <mail@3v1n0.net>
Date: Mon, 3 Jun 2024 00:15:47 +0200
Subject: [PATCH] ci: Launch pipewire through the meta-dbus-runner

We can just launch pipewire first and then wireplumber so that the test
script can be simplified

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3793>
---
 .gitlab-ci.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0faaa78e3..cddadc3b0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -484,7 +484,6 @@ build-wayland-only@x86_64:
     - !reference [.mutter.git-clone, before_script]
     # Disable e.g. audio support to not dead lock screen cast tests
     - mkdir -m 700 $XDG_RUNTIME_DIR
-    - pipewire & sleep 2
 
 .test-mutter-base:
   extends:
@@ -517,6 +516,7 @@ build-wayland-only@x86_64:
     - glib-compile-schemas $GSETTINGS_SCHEMA_DIR
     - xvfb-run -a -s "$XVFB_SERVER_ARGS"
         ./src/tests/meta-dbus-runner.py
+          --launch=pipewire
           --launch=wireplumber
           meson test
             -C build
@@ -678,6 +678,7 @@ dist-mutter:
     - glib-compile-schemas $GSETTINGS_SCHEMA_DIR
     - xvfb-run -a -s "$XVFB_SERVER_ARGS"
         ./src/tests/meta-dbus-runner.py
+          --launch=pipewire
           --launch=wireplumber
           meson dist -C build
   artifacts: