From 42f1d4a3f2515a301c12f8f485457a878d7df2dc Mon Sep 17 00:00:00 2001
From: Stefan Agner <stefan@agner.ch>
Date: Mon, 26 Aug 2024 21:36:31 +0200
Subject: [PATCH] feat: use dbus-run-session to drop X11 dependency (#299)

---
 .github/workflows/big_endian.yml | 4 ++--
 .github/workflows/ci.yml         | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/big_endian.yml b/.github/workflows/big_endian.yml
index 84a0dd31..55eca8bc 100644
--- a/.github/workflows/big_endian.yml
+++ b/.github/workflows/big_endian.yml
@@ -24,12 +24,12 @@ jobs:
             "uname -a &&
             lscpu | grep Endian &&
             apt-get -y update &&
-            apt-get -y install python3 git python3.8-venv dbus dbus-x11 python3-gi libgirepository1.0-dev gcc libcairo2-dev pkg-config python3-dev gir1.2-gtk-3.0 &&
+            apt-get -y install python3 git python3.8-venv dbus-daemon python3-gi libgirepository1.0-dev gcc libcairo2-dev pkg-config python3-dev gir1.2-gtk-3.0 &&
             python3 --version &&
             python3 -c 'import sys; print(sys.byteorder)' &&
             pip3 install poetry &&
             git clone https://github.com/bluetooth-devices/dbus-fast &&
             cd dbus-fast &&
             poetry install --only=main,dev &&
-            export $(dbus-launch); poetry run pytest --cov-report=xml --timeout=5
+            dbus-run-session -- poetry run pytest --cov-report=xml --timeout=5
             "
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 1d98206d..44c0dd9e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -53,7 +53,7 @@ jobs:
       - name: Update apt
         run: sudo apt update
       - name: Install libs
-        run: sudo apt-get install -y dbus dbus-x11 python3-gi libgirepository1.0-dev gcc libcairo2-dev pkg-config python3-dev gir1.2-gtk-3.0
+        run: sudo apt-get install -y dbus-daemon python3-gi libgirepository1.0-dev gcc libcairo2-dev pkg-config python3-dev gir1.2-gtk-3.0
       - name: Install poetry
         run: pipx install poetry
       - name: Set up Python
@@ -70,7 +70,7 @@ jobs:
             REQUIRE_CYTHON=1 poetry install --only=main,dev
           fi
       - name: Test with Pytest
-        run: export $(dbus-launch); poetry run pytest --cov-report=xml --timeout=5
+        run: dbus-run-session -- poetry run pytest --cov-report=xml --timeout=5
       - name: Upload coverage to Codecov
         uses: codecov/codecov-action@v3
         with: