[glib-networking/mcatanzaro/freedesktop-ci-templates] Use freedesktop-ci-templates

[Michael Catanzaro <mcatanzaro src gnome org>]

commit 0f20099397f3b924cbad2c9d7baf355d1e46d41a
Author: Michael Catanzaro <mcatanzaro redhat com>
Date:   Tue Jul 26 14:07:13 2022 -0500

    Use freedesktop-ci-templates
    
    This is trendy, and we don't have to maintain our own container images
    anymore.
    
    https://freedesktop.pages.freedesktop.org/ci-templates/templates.html

 .gitlab-ci.yml           | 67 ++++++++++++++++++++++++++++++++++++++++--------
 .gitlab-ci/Dockerfile    | 27 -------------------
 .gitlab-ci/README.md     | 23 -----------------
 .gitlab-ci/run-docker.sh | 19 --------------
 4 files changed, 56 insertions(+), 80 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 80ac37da..1e36d55b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,25 +1,63 @@
-image: registry.gitlab.gnome.org/gnome/glib-networking/master:v20
+include:
+ - remote: 
'https://gitlab.freedesktop.org/freedesktop/ci-templates/-/raw/c5626190ec14b475271288dda7a7dae8dbe0cd76/templates/fedora.yml'
+
+variables:
+  FDO_UPSTREAM_REPO: gnome/glib-networking
+
+stages:
+  - prepare
+  - build
+
+.fedora.container.common:
+  variables:
+    FDO_DISTRIBUTION_TAG: '2022-07-26.1'
+    FDO_DISTRIBUTION_VERSION: 'latest'
+
+build.container.fedora@x86_64:
+  extends:
+  - '.fdo.container-build@fedora'
+  - '.fedora.container.common'
+  stage: prepare
+  variables:
+    GIT_STRATEGY: none
+    FDO_EXPIRES_AFTER: 8w
+    FDO_DISTRIBUTION_PACKAGES: >-
+      ca-certificates
+      gcc
+      gettext
+      meson
+      pkgconfig(glib-2.0)
+      pkgconfig(gio-2.0)
+      pkgconfig(gnutls)
+      pkgconfig(gsettings-desktop-schemas)
+      pkgconfig(gobject-2.0)
+      pkgconfig(libproxy-1.0)
+      pkgconfig(openssl)
+      pkgconfig(p11-kit-1)
 
 fedora-x86_64:
+  extends:
+    - '.fdo.distribution-image@fedora'
+    - '.fedora.container.common'
   stage: build
   variables:
     # Remove for PKCS11 logs, otherwise generates a lot of noise hitting gitlab's limit
     PKCS11SPY_PATH: disabled
   script:
     - cp .gitlab-ci/lcovrc ~/.lcovrc
-    - meson --prefix=$HOME/glib-networking-installed
-            -Db_coverage=true
-            -Dgnutls=enabled
-            -Dopenssl=enabled
-            -Dlibproxy=enabled
-            -Dgnome_proxy=enabled
-            -Ddebug_logs=true
-            -Dwerror=true
-            _build/
+    - meson setup --prefix=$HOME/glib-networking-installed
+        -Db_coverage=true
+        -Dgnutls=enabled
+        -Dopenssl=enabled
+        -Dlibproxy=enabled
+        -Dgnome_proxy=enabled
+        -Ddebug_logs=true
+        -Dwerror=true
+        _build/
     - meson compile -C _build/
     - meson test -v -C _build/ --repeat=10
     - meson install -C _build/
-    - ninja -C _build coverage-html
+    - meson compile -C _build/ coverage-html
   artifacts:
     paths:
       - _build/test-results
@@ -27,7 +65,11 @@ fedora-x86_64:
     when: always
   coverage: '/^\s+lines\.+:\s+([\d.]+\%)\s+/'
 
+
 fedora-x86_64-asan:
+  extends:
+    - '.fdo.distribution-image@fedora'
+    - '.fedora.container.common'
   tags: [ asan ]
   stage: build
   variables:
@@ -50,6 +92,9 @@ fedora-x86_64-asan:
     when: on_failure
 
 fedora-x86_64-scan-build:
+  extends:
+    - '.fdo.distribution-image@fedora'
+    - '.fedora.container.common'
   stage: build
   script:
     - meson -Dgnutls=enabled