ci: Update to F36

1 files changed, 14 insertions, 32 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 362806a..69b1cb7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -52,11 +52,7 @@ check-merge-request:
 .build-template: &build
   stage: build
   script:
-      - git clone --depth=1 https://gitlab.gnome.org/GNOME/libsoup.git && pushd libsoup
-      - meson _build --prefix=/usr -Dtls_check=false -Ddocs=disabled
-      - ninja -C _build install
-      - popd
-      - meson . build --prefix=/usr -Db_coverage=true 
+      - meson . build --prefix=/usr -Db_coverage=true
       - ninja -C build
   artifacts:
       expire_in: 1 day
@@ -65,34 +61,23 @@ check-merge-request:
 
 .gssdp.fedora@common:
   variables:
-    BASE_TAG: '2022-02-12.2'
+    BASE_TAG: '2022-06-04.1'
     FDO_UPSTREAM_REPO: GNOME/gssdp
-    FDO_DISTRIBUTION_PACKAGES: 'clang clang-analyzer gcovr git libasan libubsan python3-gobject python3-pip xmlto gtk4-devel'
+    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 gtk4-devel'
     FDO_DISTRIBUTION_EXEC: |
-      dnf install -y 'dnf-command(builddep)' &&
-      dnf builddep -y gssdp --setopt=install_weak_deps=False &&
-      dnf install -y libnghttp2-devel libpsl-devel sqlite-devel &&
       dnf clean all &&
       pip3 install meson markdown gi-docgen jinja2 Markdown markupsafe pygments toml typogrify
 
-.soup3:
-  before_script:
-    - git clone --depth=1 https://gitlab.gnome.org/GNOME/libsoup.git && pushd libsoup
-    - meson _build --prefix=/usr -Dtls_check=false -Ddocs=disabled
-    - ninja -C _build install
-    - popd
-
-.gssdp.fedora:35@x86_64:
-  extends:
-    - .gssdp.fedora@common
+.gssdp.fedora:36@x86_64:
+  extends: .gssdp.fedora@common
   variables:
-    FDO_DISTRIBUTION_VERSION: 35
+    FDO_DISTRIBUTION_VERSION: 36
     FDO_DISTRIBUTION_TAG: "x86_64-${BASE_TAG}"
 
 build-fedora-container@x86_64:
   extends:
     - .fdo.container-build@fedora
-    - .gssdp.fedora:35@x86_64
+    - .gssdp.fedora:36@x86_64
   stage: prepare
   variables:
     GIT_STRATEGY: none
@@ -101,7 +86,7 @@ build-fedora-container@x86_64:
 build-fedora@x86_64:
     extends:
         - .fdo.distribution-image@fedora
-        - .gssdp.fedora:35@x86_64
+        - .gssdp.fedora:36@x86_64
     needs:
         - build-fedora-container@x86_64
     <<: *build
@@ -119,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: "
@@ -143,8 +128,7 @@ build-fedora@x86_64:
 test-fedora@x86_64:
   extends:
     - .fdo.distribution-image@fedora
-    - .gssdp.fedora:35@x86_64
-    - .soup3
+    - .gssdp.fedora:36@x86_64
   needs:
     - build-fedora@x86_64
   <<: *test
@@ -160,7 +144,7 @@ trigger-gupnp:
 coverage-analysis:
   extends:
     - .fdo.distribution-image@fedora
-    - .gssdp.fedora:35@x86_64
+    - .gssdp.fedora:36@x86_64
   stage: analysis
   allow_failure: true
   script:
@@ -178,8 +162,7 @@ coverage-analysis:
 static-scan:
   extends:
     - .fdo.distribution-image@fedora
-    - .gssdp.fedora:35@x86_64
-    - .soup3
+    - .gssdp.fedora:36@x86_64
   stage: analysis
   needs:
     - build-fedora-container@x86_64
@@ -199,7 +182,7 @@ static-scan:
 coverity:
   extends:
     - .fdo.distribution-image@fedora
-    - .gssdp.fedora:35@x86_64
+    - .gssdp.fedora:36@x86_64
   stage: analysis
   allow_failure: true
   script:
@@ -226,8 +209,7 @@ coverity:
 pages:
   extends:
     - .fdo.distribution-image@fedora
-    - .gssdp.fedora:35@x86_64
-    - .soup3
+    - .gssdp.fedora:36@x86_64
   stage: website
   script:
       - meson doc-build -Dgtk_doc=true