Merge branch 'gtk-doc-ci' into 'master'

Publish the API reference

See merge request GNOME/gtk!1367

.gitlab-ci.yml

@@ -1,7 +1,7 @@
 stages:
   - build
   - flatpak
-#  - deploy
+  - deploy
 
 .cache-paths: &cache-paths
   paths:
@@ -13,7 +13,7 @@ stages:
     - subprojects/pango/
 
 fedora-x86_64: &fedora-x86_64-defaults
-  image: registry.gitlab.gnome.org/gnome/gtk/master:v9
+  image: registry.gitlab.gnome.org/gnome/gtk/master:v10
   stage: build
   script:
     - bash -x ./.gitlab-ci/test-docker.sh
@@ -107,19 +107,19 @@ flatpak-master:icon-browser:
     APPID: org.gtk.IconBrowser4
   <<: *flatpak-master
 
-#pages:
-#  image: registry.gitlab.gnome.org/gnome/gtk/master:v6
-#  stage: deploy 
-#  script:
-#    - meson -Dgtk_doc=true _build .
-#    - ninja -C _build
-#    - ninja -C _build gdk4-doc gsk4-doc gtk4-doc
-#    - mkdir -p public/
-#    - mv _build/docs/reference/gtk/html/ public/gtk/
-#    - mv _build/docs/reference/gdk/html/ public/gdk/
-#    - mv _build/docs/reference/gsk/html/ public/gsk/
-#  artifacts:
-#    paths:
-#      - public
-#  only:
-#    - master
+pages:
+  image: registry.gitlab.gnome.org/gnome/gtk/master:v10
+  stage: deploy
+  script:
+    - meson -Dgtk_doc=true _build .
+    - ninja -C _build
+    - ninja -C _build gdk4-doc gsk4-doc gtk4-doc
+    - mkdir -p public/
+    - mv _build/docs/reference/gtk/html/ public/gtk/
+    - mv _build/docs/reference/gdk/html/ public/gdk/
+    - mv _build/docs/reference/gsk/html/ public/gsk/
+  artifacts:
+    paths:
+      - public
+  only:
+    - master

.gitlab-ci/Dockerfile

@@ -76,7 +76,7 @@ RUN dnf -y install \
     xorg-x11-server-Xvfb \
  && dnf clean all
 
-RUN pip3 install meson==0.50.1
+RUN pip3 install meson==0.52.1
 
 ARG HOST_USER_ID=5555
 ENV HOST_USER_ID ${HOST_USER_ID}

.gitlab-ci/run-docker.sh

@@ -2,7 +2,7 @@
 
 set -e
 
-TAG="registry.gitlab.gnome.org/gnome/gtk/master:v7"
+TAG="registry.gitlab.gnome.org/gnome/gtk/master:v10"
 
 sudo docker build --build-arg HOST_USER_ID="$UID" --tag "${TAG}" \
     --file "Dockerfile" .

docs/reference/meson.build

@@ -1,4 +1,13 @@
 if get_option('gtk_doc')
+  if not meson.version().version_compare('>=0.52.0')
+    error('Building the GTK documentation requires Meson 0.52.0')
+  endif
+
+  # Use gtk-doc as a sub-project if the version isn't new enough
+  dependency('gtk-doc', version: '>=1.32',
+    fallback: ['gtk-doc', 'dummy_dep'],
+    default_options: ['tests=false'])
+
   glib_prefix = dependency('glib-2.0').get_pkgconfig_variable('prefix')
   glib_docpath = join_paths(glib_prefix, 'share', 'gtk-doc', 'html')
 

subprojects/gtk-doc.wrap

@@ -0,0 +1,4 @@
+[wrap-git]
+directory=gtk-doc
+url=https://gitlab.gnome.org/GNOME/gtk-doc.git
+revision=master

testsuite/reftests/meson.build

@@ -425,16 +425,11 @@ xfails = [
   'background-image-multiple.ui',
   'background-origin.ui',
   'border-half-pixel.ui',
-  'border-image-url.ui',
   'sizegroups-evolution-identity-page.ui',
   'textview-border-windows.ui',
   'window-show-contents-on-map.ui',
-  'toplevel-vs-popup.ui',
   # these depend on details of text layout
-  'label-background.ui',
-  'label-wrap-justify.ui',
   'label-sizing.ui',
-  'quit-mnemonic.ui',
 ]
 
 foreach testname : testdata