[gssdp/wip/ci] ci: wip

[Jens Georg <jensgeorg src gnome org>]

commit 1601eec124a230439fcf5eccc86ba3289695110c
Author: Jens Georg <mail jensge org>
Date:   Sat Feb 12 13:34:43 2022 +0100

    ci: wip

 .gitlab-ci.yml | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 57c3359..a119e30 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -50,6 +50,7 @@ check-merge-request:
   <<: *check
 
 .build-template: &build
+  extends: .soup3
   stage: build
   script:
       - meson . build --prefix=/usr -Db_coverage=true 
@@ -61,7 +62,7 @@ check-merge-request:
 
 .gssdp.fedora@common:
   variables:
-    BASE_TAG: '2022-02-12.1'
+    BASE_TAG: '2022-02-12.2'
     FDO_UPSTREAM_REPO: GNOME/gssdp
     FDO_DISTRIBUTION_PACKAGES: 'clang clang-analyzer gcovr git libasan libubsan python3-gobject python3-pip 
xmlto gtk4-devel'
     FDO_DISTRIBUTION_EXEC: |
@@ -71,17 +72,20 @@ check-merge-request:
       dnf clean all &&
       pip3 install meson markdown gi-docgen jinja2 Markdown markupsafe pygments toml typogrify
 
-.gssdp.fedora:35@x86_64:
-  extends: .gssdp.fedora@common
-  variables:
-    FDO_DISTRIBUTION_VERSION: 35
-    FDO_DISTRIBUTION_TAG: "x86_64-${BASE_TAG}"
+.soup3:
   before_script:
     - git clone --depth=1 https://gitlab.gnome.org/GNOME/libsoup.git && pushd libsoup
     - meson _build --prefix=/usr -Dtls_check=false -Dgtk_doc=false
     - ninja -C _build install
     - popd
 
+.gssdp.fedora:35@x86_64:
+  extends:
+    - .gssdp.fedora@common
+  variables:
+    FDO_DISTRIBUTION_VERSION: 35
+    FDO_DISTRIBUTION_TAG: "x86_64-${BASE_TAG}"
+
 build-fedora-container@x86_64:
   extends:
     - .fdo.container-build@fedora
@@ -137,6 +141,7 @@ test-fedora@x86_64:
   extends:
     - .fdo.distribution-image@fedora
     - .gssdp.fedora:35@x86_64
+    - .soup3
   needs:
     - build-fedora@x86_64
   <<: *test
@@ -171,6 +176,7 @@ static-scan:
   extends:
     - .fdo.distribution-image@fedora
     - .gssdp.fedora:35@x86_64
+    - .soup3
   stage: analysis
   needs:
     - build-fedora-container@x86_64
@@ -191,6 +197,7 @@ pages:
   extends:
     - .fdo.distribution-image@fedora
     - .gssdp.fedora:35@x86_64
+    - .soup3
   stage: website
   script:
       - meson doc-build -Dgtk_doc=true