From 72e0a79d92f912d24241f7f2c3846b040893486f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pablo=20Correa=20G=C3=B3mez?= <ablocorrea@hotmail.com>
Date: Fri, 11 Nov 2022 14:41:21 +0100
Subject: [PATCH] fixup! Dockerfile: build against GNOME 43

---
 .github/Dockerfile                  | 4 +++-
 .github/workflows/docker-image.yaml | 2 +-
 .github/workflows/unittests.yaml    | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.github/Dockerfile b/.github/Dockerfile
index ac02d12..fbdf429 100644
--- a/.github/Dockerfile
+++ b/.github/Dockerfile
@@ -13,11 +13,13 @@ RUN curl -L -O https://gitlab.gnome.org/GNOME/gnome-software/-/archive/${BRANCH}
     && cd gnome-software-${BRANCH} \
     && meson \
        --prefix /usr \
-       -Dvalgrind=false \
        -Dmalcontent=false \
        -Dpackagekit=false \
        -Dfwupd=false \
        -Dflatpak=false \
+       -Dwebapps=false \
+       -Dhardcoded_foss_webapps=false \
+       -Dhardcoded_proprietary_webapps=false \
        -Dgtk_doc=false \
        -Dman=false \
        -Dtests=false \
diff --git a/.github/workflows/docker-image.yaml b/.github/workflows/docker-image.yaml
index 393b64b..434f0a4 100644
--- a/.github/workflows/docker-image.yaml
+++ b/.github/workflows/docker-image.yaml
@@ -46,7 +46,7 @@ jobs:
           labels: ${{ steps.meta.outputs.labels }}
 
       - name: Build and test plugin
-        run: docker run --mount type=bind,src=${{ github.workspace }},dst=/repo --rm ${{ env.REGISTRY }}/${{ env.IMAGE_NAME}}:${{ env.VERSION}} /bin/ash -c "cd repo && meson build && ninja -C build && meson test -v -C build"
+        run: docker run --mount type=bind,src=${{ github.workspace }},dst=/repo --rm ${{ env.REGISTRY }}/${{ env.IMAGE_NAME}}:${{ env.VERSION}} /bin/ash -c "cd repo && meson build && ninja -C build && dbus-daemon --system --fork --nopidfile && dbus-run-session -- meson test -v -C build"
 
       - name: Push Docker image
         if: github.event_name == 'push'
diff --git a/.github/workflows/unittests.yaml b/.github/workflows/unittests.yaml
index 77b424e..3517bcf 100644
--- a/.github/workflows/unittests.yaml
+++ b/.github/workflows/unittests.yaml
@@ -22,4 +22,4 @@ jobs:
         run: meson build && ninja -C build
 
       - name: Test
-        run: meson test -v -C build
+        run: dbus-daemon --system --fork --nopidfile && dbus-run-session -- meson test -v -C build