summaryrefslogtreecommitdiff
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
authorChristoph Reiter <reiter.christoph@gmail.com>2023-01-27 20:01:48 +0100
committerChristoph Reiter <reiter.christoph@gmail.com>2023-01-27 20:08:31 +0000
commit6152280fcc209c37632e1e6d78f58b7c4c9fb4bb (patch)
treedc124bc8d18a7fba22aca9683e45b052c34deac3 /.gitlab-ci.yml
parent0f8a2e5428ece351914d25b7fcd91da4ff6c0aa7 (diff)
downloadpygobject-6152280fcc209c37632e1e6d78f58b7c4c9fb4bb.tar.gz
CI: try to make the flatpak tests run again
Half a year ago they broke due to some changes of either the gnome-runtime-images docker images, or the contained flatpak, or something else: https://gitlab.gnome.org/GNOME/gnome-runtime-images/-/issues/7 This creates a fake dbus system bus so flatpak run doesn't fail. After this it turned out that pip install is now completely broken in the sdk and it installs packages to a place where it can't find them afterwards, so just use a venv instead. Finally the pygobject test suite still crashes at some point, but at least it's better then before.
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml8
1 files changed, 6 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 634a5f4c..0f9b48a8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -110,7 +110,9 @@ gnome-master:
tags:
- flatpak
script:
- - xvfb-run -a flatpak run --filesystem=host --share=network --socket=x11 --command=bash org.gnome.Sdk//master -x .gitlab-ci/test-flatpak.sh
+ # https://gitlab.gnome.org/GNOME/gnome-runtime-images/-/issues/7
+ - export DBUS_SYSTEM_BUS_ADDRESS="$(dbus-daemon --session --print-address --fork)"
+ - xvfb-run -a flatpak run --user --filesystem=host --share=network --socket=x11 --command=bash org.gnome.Sdk//master -x .gitlab-ci/test-flatpak.sh
gnome-master-gtk4:
allow_failure: true
@@ -119,7 +121,9 @@ gnome-master-gtk4:
tags:
- flatpak
script:
- - xvfb-run -a flatpak run --filesystem=host --share=network --socket=x11 --command=bash org.gnome.Sdk//master -x .gitlab-ci/test-flatpak-gtk4.sh
+ # https://gitlab.gnome.org/GNOME/gnome-runtime-images/-/issues/7
+ - export DBUS_SYSTEM_BUS_ADDRESS="$(dbus-daemon --session --print-address --fork)"
+ - xvfb-run -a flatpak run --user --filesystem=host --share=network --socket=x11 --command=bash org.gnome.Sdk//master -x .gitlab-ci/test-flatpak-gtk4.sh
artifacts:
paths:
- coverage/