From bb1e3ded40d346f5180831dc28e857d0d89d1f7b Mon Sep 17 00:00:00 2001
From: Jens Georg <mail@jensge.org>
Date: Wed, 25 May 2022 12:59:22 +0200
Subject: ci: Bump base image to Fedore 36

---
 .gitlab-ci.yml | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bb38f26..2186c11 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,6 +1,6 @@
 include:
-    - remote: "https://gitlab.freedesktop.org/freedesktop/ci-templates/-/raw/290b79e0e78eab67a83766f4e9691be554fc4afd/templates/ci-fairy.yml"
-    - remote: 'https://gitlab.freedesktop.org/freedesktop/ci-templates/-/raw/290b79e0e78eab67a83766f4e9691be554fc4afd/templates/fedora.yml'
+    - remote: "https://gitlab.freedesktop.org/freedesktop/ci-templates/-/raw/0c312d9c7255f46e741d43bcd1930f09cd12efe7/templates/ci-fairy.yml"
+    - remote: 'https://gitlab.freedesktop.org/freedesktop/ci-templates/-/raw/0c312d9c7255f46e741d43bcd1930f09cd12efe7/templates/fedora.yml'
 
 variables:
     MESON_TEST_TIMEOUT_MULTIPLIER: 3
@@ -61,23 +61,23 @@ check-merge-request:
 
 .gupnp.fedora@common:
   variables:
-    BASE_TAG: '2021-08-14.0'
+    BASE_TAG: '2022-05-25.0'
     FDO_UPSTREAM_REPO: GNOME/gupnp-igd
-    FDO_DISTRIBUTION_PACKAGES: 'clang clang-analyzer gcovr git libasan libubsan python3-gobject python3-pip xmlto gobject-introspection-devel gtk-doc libsoup-devel libuuid-devel libxml2-devel vala ninja-build'
+    FDO_DISTRIBUTION_PACKAGES: 'clang clang-analyzer gcovr git libasan libubsan python3-gobject python3-pip xmlto gobject-introspection-devel gtk-doc libsoup3-devel libuuid-devel libxml2-devel vala ninja-build python3-setuptools'
     FDO_DISTRIBUTION_EXEC: |
       dnf clean all &&
-      pip3 install meson markdown toml typogrify
+      pip3 install meson markdown gi-docgen jinja2 Markdown markupsafe pygments toml typogrify
 
-.gupnp.fedora:34@x86_64:
+.gupnp.fedora:36@x86_64:
   extends: .gupnp.fedora@common
   variables:
-    FDO_DISTRIBUTION_VERSION: 34
+    FDO_DISTRIBUTION_VERSION: 36
     FDO_DISTRIBUTION_TAG: "x86_64-${BASE_TAG}"
 
 build-fedora-container@x86_64:
   extends:
     - .fdo.container-build@fedora
-    - .gupnp.fedora:34@x86_64
+    - .gupnp.fedora:36@x86_64
   stage: prepare
   variables:
     GIT_STRATEGY: none
@@ -86,7 +86,7 @@ build-fedora-container@x86_64:
 build-fedora@x86_64:
     extends:
         - .fdo.distribution-image@fedora
-        - .gupnp.fedora:34@x86_64
+        - .gupnp.fedora:36@x86_64
     needs:
         - build-fedora-container@x86_64
     <<: *build
@@ -104,7 +104,7 @@ build-fedora@x86_64:
       # whole environment for every failed test, and that gives a whole
       # screenful of junk each time unless we strip these.
       unset $(env|grep -o '^CI_[^=]*')
-      env LANG=C.UTF-8 LC_ALL=C.UTF-8 meson test --print-errorlogs ${MESON_TEST_EXTRA_ARGS}
+      env LANG=C.UTF-8 LC_ALL=C.UTF-8 meson test --timeout-multiplier ${MESON_TEST_TIMEOUT_MULTIPLIER} --print-errorlogs ${MESON_TEST_EXTRA_ARGS}
   after_script:
     - |
       echo "Distribution: "
@@ -128,7 +128,7 @@ build-fedora@x86_64:
 test-fedora@x86_64:
   extends:
     - .fdo.distribution-image@fedora
-    - .gupnp.fedora:34@x86_64
+    - .gupnp.fedora:36@x86_64
   needs:
     - build-fedora@x86_64
   <<: *test
@@ -144,7 +144,7 @@ test-fedora@x86_64:
 coverage-analysis:
   extends:
     - .fdo.distribution-image@fedora
-    - .gupnp.fedora:34@x86_64
+    - .gupnp.fedora:36@x86_64
   stage: analysis
   allow_failure: true
   script:
@@ -162,7 +162,7 @@ coverage-analysis:
 static-scan:
   extends:
     - .fdo.distribution-image@fedora
-    - .gupnp.fedora:34@x86_64
+    - .gupnp.fedora:36@x86_64
   stage: analysis
   needs:
     - build-fedora-container@x86_64
@@ -177,7 +177,7 @@ static-scan:
 pages:
   extends:
     - .fdo.distribution-image@fedora
-    - .gupnp.fedora:34@x86_64
+    - .gupnp.fedora:36@x86_64
   stage: website
   script:
       - meson doc-build -Dgtk_doc=true
-- 
cgit v1.2.1