[libgweather/pgriffis/libsoup-ci] fixup! ci: Build against both libsoup2 and libsoup3

[Patrick Griffis <pgriffis src gnome org>]

commit db3d1b091f6567855526abcc985b1d6034efe18d
Author: Patrick Griffis <pgriffis igalia com>
Date:   Tue Oct 5 16:07:28 2021 -0500

    fixup! ci: Build against both libsoup2 and libsoup3

 .ci/check-abi  | 113 ---------------------------------------------------------
 .gitlab-ci.yml |   6 ++-
 2 files changed, 4 insertions(+), 115 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 19f5e6cf..248bdba5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -20,6 +20,7 @@ variables:
     gcc-c++
     gtk-doc
     json-glib-devel
+    gnutls-devel
     libnghttp2-devel
     sqlite-devel
     libpsl-devel
@@ -30,7 +31,8 @@ variables:
     - meson _build -Dsoup2=${SOUP2_ENABLED}
     - ninja -C _build install
     - ninja -C _build test
-    - ./.ci/check-abi ${LAST_ABI_BREAK} $(git rev-parse HEAD)
+    - curl https://gitlab.freedesktop.org/hadess/check-abi/-/raw/main/contrib/check-abi-fedora.sh | bash
+    - check-abi --new-parameters="-Dsoup2=${SOUP2_ENABLED}" ${LAST_ABI_BREAK} $(git rev-parse HEAD)
   artifacts:
     name: "libgweather-${CI_JOB_NAME}-${CI_COMMIT_REF_NAME}"
     when: on_failure
@@ -71,7 +73,7 @@ build-fedora-soup3:
     - meson _build --prefix=/usr -Dtls_check=false
     - ninja -C _build install
     - popd
-    - git clone https://gitlab.gnome.org/GNOME/geocode-glib.git --branch=pgriffis/soupapiversion && pushd 
geocode-glib
+    - git clone https://gitlab.gnome.org/GNOME/geocode-glib.git && pushd geocode-glib
     - meson _build --prefix=/usr -Dsoup2=false
     - ninja -C _build install
     - popd