fixup! Dockerfile: build against GNOME 43

Cogitri · Nov 11, 2022 · 72e0a79 · 72e0a79
1 parent 3c9f3af
commit 72e0a79
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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