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

[Patrick Griffis <pgriffis src gnome org>]

commit eec7070482f123f39c80686ab060c9c5a1a870f0
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, 42 insertions(+), 6 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7961bdc..837f6e2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,17 +1,53 @@
 variables:
     LAST_ABI_BREAK: 5cd4856c207e169aa535a9e32f3361b61af639b2
 
-build-fedora:
+.build:
   image: fedora:latest
+  script:
+    - meson _build -Dsoup2=${SOUP2_ENABLED}
+    - ninja -C _build install
+    - ninja -C _build test
+    - ./.ci/check-abi ${LAST_ABI_BREAK} $(git rev-parse HEAD)
+  artifacts:
+    name: "geocode-glib-${CI_JOB_NAME}-${CI_COMMIT_REF_NAME}"
+    when: on_failure
+    paths:
+      - "glib/_build/meson-logs/testlog.txt"
+      - "libsoup/_build/meson-logs/testlog.txt"
+      - "_build/meson-logs/testlog.txt"
+
+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
     # Add locales support required for tests
     - dnf install -y glibc-langpack-fr glibc-langpack-cs glibc-langpack-en
-    - dnf install -y glib2-devel json-glib-devel libsoup-devel gtk-doc meson git gcc gcc-c++ glibc-devel 
libabigail
-  script:
-    - meson _build
+    - dnf install -y json-glib-devel gtk-doc meson git gcc gcc-c++ glibc-devel libabigail
+    # Tasks specific to soup2
+    - dnf install -y glib2-devel libsoup-devel
+
+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
+    # Add locales support required for tests
+    - dnf install -y glibc-langpack-fr glibc-langpack-cs glibc-langpack-en
+    - dnf install -y json-glib-devel gtk-doc meson git gcc gcc-c++ glibc-devel libabigail
+    # Tasks specific to soup3 (glib 2.70, libsoup 3)
+    - dnf install -y libnghttp2-devel sqlite-devel libpsl-devel
+    - git clone --depth=1 https://gitlab.gnome.org/GNOME/glib.git && pushd glib
+    - meson _build --prefix=/usr
     - ninja -C _build install
-    - ninja -C _build test
-    - ./.ci/check-abi ${LAST_ABI_BREAK} $(git rev-parse HEAD)
+    - popd
+    - git clone --depth=1 https://gitlab.gnome.org/GNOME/libsoup.git && pushd libsoup
+    - meson _build --prefix=/usr
+    - ninja -C _build install
+    - popd