[gnome-initial-setup/wip/wjt/fdo-ci-template] fixup! ci: Switch to freedesktop/ci-templates

[Will Thompson <wjt src gnome org>]

commit 7aad9c05893252b190710cf333bff8c7b633c4f5
Author: Will Thompson <will willthompson co uk>
Date:   Sat Feb 19 08:54:17 2022 +0000

    fixup! ci: Switch to freedesktop/ci-templates

 .gitlab-ci.yml | 30 +++++++++++++++++++-----------
 1 file changed, 19 insertions(+), 11 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7acdb230..0ebcff33 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -14,10 +14,8 @@ stages:
     # to the release number/branch to ensure that
     # a new image will be created, tailored for the
     # stable branch.
-    # Could probably also switch away from rawhide,
-    # to stable fedora branch as well.
-    FDO_DISTRIBUTION_TAG: '2022-02-18.1-main'
-    FDO_DISTRIBUTION_VERSION: 36
+    FDO_DISTRIBUTION_TAG: '2022-02-19.0-main'
+    FDO_DISTRIBUTION_VERSION: 34
 
 # See also https://gitlab.freedesktop.org/freedesktop/ci-templates
 build.container.fedora@x86_64:
@@ -49,17 +47,14 @@ build.container.fedora@x86_64:
       geoclue2-devel
       geocode-glib-devel
       glib2-devel
-      gnome-desktop4-devel
       gnome-online-accounts-devel
       gobject-introspection-devel
       gstreamer1-devel
       gtk-doc
       gtk3-devel
-      gtk4-devel
       ibus-devel
       krb5-devel
       libgweather4-devel
-      libhandy-devel
       libnma-devel
       libpwquality-devel
       libsecret-devel
@@ -68,12 +63,25 @@ build.container.fedora@x86_64:
       rest-devel
       webkit2gtk3-devel
     FDO_DISTRIBUTION_EXEC: |-
+      git clone https://gitlab.gnome.org/GNOME/libgweather.git && \
+        cd libgweather && \
+        meson . _build --prefix=/usr/local -Denable_vala=false -Dgtk_doc=false -Dintrospection=false 
-Dtests=false &&& \
+        ninja -C _build -v && \
+        ninja -C _build -v install && \
+        cd .. && \
+      git clone https://gitlab.gnome.org/GNOME/gnome-desktop.git && \
+        cd gnome-desktop && \
+        meson . _build --prefix=/usr/local -Dwerror=false -Dgtk_doc=false -Ddesktop_docs=false 
-Dlegacy_library=false && \
+        ninja -C _build -v && \
+        ninja -C _build -v install && \
+        cd .. && \
       git clone https://gitlab.gnome.org/GNOME/libhandy.git && \
-        cd libhandy  && \
+        cd libhandy && \
         meson . _build --prefix=/usr/local -Dexamples=false -Dglade_catalog=disabled -Dgtk_doc=false 
-Dintrospection=disabled -Dprofiling=false -Dtests=false -Dvapi=false && \
-        ninja -C _build && \
-        ninja -C _build install && \
-        cd ..
+        ninja -C _build -v && \
+        ninja -C _build -v install && \
+        cd .. && \
+      true
 
 .job_template: &job_definition
   extends: