ci: Enable introspection

ci: Use the v26 of the Fedora image
This inclucs python3-gobject.
2021-01-17 22:06:28 -05:00 · 2021-01-17 19:48:39 -05:00 · 2021-01-17 19:43:10 -05:00 · 2021-01-15 22:57:03 -05:00 · 2021-01-15 21:52:51 -05:00
5 changed files with 29 additions and 3 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -22,9 +22,9 @@ stages:
 variables:
  COMMON_MESON_FLAGS: "-Dwerror=true -Dglib:werror=false -Dpango:werror=false -Dgtk-doc:werror=false -Dwayland-protocols:werror=false -Dsysprof:werror=false"
  BACKEND_FLAGS: "-Dx11-backend=true -Dwayland-backend=true -Dbroadway-backend=true"
-  FEATURE_FLAGS: "-Dvulkan=enabled -Dcloudproviders=enabled"
+  FEATURE_FLAGS: "-Dvulkan=enabled -Dcloudproviders=enabled -Dintrospection=enabled"
  MESON_TEST_TIMEOUT_MULTIPLIER: 3
-  FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora:v25"
+  FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora:v26"
  FLATPAK_IMAGE: "registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:master"
  DOCS_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora-docs:v25"

--- a/.gitlab-ci/fedora-base.Dockerfile
+++ b/.gitlab-ci/fedora-base.Dockerfile
@@ -71,6 +71,7 @@ RUN dnf -y install \
    pcre-devel \
    pcre-static \
    python3 \
+    python3-gobject \
    python3-jinja2 \
    python3-pip \
    python3-pygments \
--- a/.gitlab-ci/fedora.Dockerfile
+++ b/.gitlab-ci/fedora.Dockerfile
@@ -1,4 +1,4 @@
-FROM registry.gitlab.gnome.org/gnome/gtk/fedora-base:v25
+FROM registry.gitlab.gnome.org/gnome/gtk/fedora-base:v26

 # Enable sudo for wheel users
 RUN sed -i -e 's/# %wheel/%wheel/' -e '0,/%wheel/{s/%wheel/# %wheel/}' /etc/sudoers
--- a/testsuite/gtk/meson.build
+++ b/testsuite/gtk/meson.build
@@ -268,6 +268,16 @@ foreach test : focus_chain_tests
  )
 endforeach

+if build_gir
+  python = find_program ('python3')
+  env = environment()
+  env.set('LD_LIBRARY_PATH', join_paths(meson.build_root(), 'gtk'))
+  env.set('GI_TYPELIB_DIR', join_paths(meson.build_root(), 'gtk'))
+  test('testgir', python,
+       args: [ join_paths(meson.current_source_dir(), 'testgir') ],
+       env: env,
+       suite: [ 'gtk', 'gir' ])
+endif

 if get_option('install-tests')
  foreach t : tests
--- a/testsuite/gtk/testgir
+++ b/testsuite/gtk/testgir
@@ -0,0 +1,15 @@
+#! /usr/bin/python3
+
+import gi
+gi.require_version('Gtk', '4.0')
+from gi.repository import GLib
+from gi.repository import Gtk
+
+def quit(win):
+  win.destroy()
+
+win = Gtk.Window()
+win.show()
+GLib.timeout_add(2000, quit, win)
+while win.get_visible():
+  GLib.MainContext().default().iteration(True)
Author	SHA1	Message	Date
Matthias Clasen	90da50857c	ci: Enable introspection	2021-01-17 22:06:28 -05:00
Matthias Clasen	b27b58f0d9	ci: Use the v26 of the Fedora image This inclucs python3-gobject.	2021-01-17 19:48:39 -05:00
Matthias Clasen	b8f984e214	ci: Add python3-gobject to the fedora image We need this to run tests using our gir.	2021-01-17 19:43:10 -05:00
Matthias Clasen	31267f1c48	Add a gir test This test doesn't test much, but it loads Gtk-4.0.gir from python and creates a window, just to see that things work.	2021-01-15 22:57:03 -05:00
Matthias Clasen	f0db36677b	Merge branch 'rtl-margins' into 'master' Flip margin-start and -end in RTL Closes #3583 See merge request GNOME/gtk!3081	2021-01-15 21:52:51 -05:00