[geocode-glib/pgriffis/libsoup3: 2/2] ci: Build both soup2 and soup3 variants

[Patrick Griffis <pgriffis src gnome org>]

commit 155d126c68e55e28c4c58871a263c344c4e14266
Author: Patrick Griffis <pgriffis igalia com>
Date:   Mon Sep 13 12:19:11 2021 -0500

    ci: Build both soup2 and soup3 variants

 .gitlab-ci.yml | 48 +++++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 43 insertions(+), 5 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d45a435..103dcd1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -15,16 +15,54 @@ variables:
       libabigail
     SOUP2_DEPS:
       libsoup-devel
+    SOUP3_DEPS:
+      libnghttp2-devel
+      sqlite-devel
+      libpsl-devel
 
-build-fedora:
+.build:
   image: fedora:latest
+  script:
+    - meson _build -Dsoup2=${SOUP2_ENABLED}
+    - ninja -C _build install
+    - ninja -C _build test
+  artifacts:
+    name: "geocode-glib-${CI_JOB_NAME}-${CI_COMMIT_REF_NAME}"
+    when: on_failure
+    paths:
+      - "**/meson-logs/*"
+
+build-fedora-soup2:
+  extends: .build
+  variables:
+    SOUP2_ENABLED: 'true'
   before_script:
     # Undo delangification present in the Fedora Docker images
     - rm -f /etc/rpm/macros.image-language-conf
     - dnf reinstall -y glib2 glibc
+    # Install dependencies
     - dnf install -y $COMMON_DEPS $SOUP2_DEPS
-  script:
-    - meson _build
-    - ninja -C _build install
-    - ninja -C _build test
+  after_script:
     - ./.ci/check-abi ${LAST_ABI_BREAK} $(git rev-parse HEAD)
+
+build-fedora-soup3:
+  extends: .build
+  variables:
+    SOUP2_ENABLED: 'false'
+  before_script:
+    # Undo delangification present in the Fedora Docker images
+    - rm -f /etc/rpm/macros.image-language-conf
+    - dnf reinstall -y glib2 glibc
+    # Install dependencies
+    - dnf install -y $COMMON_DEPS $SOUP3_DEPS
+    # Build libsoup 3 (requires glib 2.70)
+    - dnf install -y libnghttp2-devel sqlite-devel libpsl-devel
+    - git clone https://gitlab.gnome.org/GNOME/glib.git && pushd glib
+    - git checkout 2.69.3
+    - meson _build --prefix=/usr
+    - ninja -C _build install
+    - popd
+    - git clone --depth=1 https://gitlab.gnome.org/GNOME/libsoup.git && pushd libsoup
+    - meson _build --prefix=/usr -Dtls_check=false
+    - ninja -C _build install
+    - popd