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




commit 8f3344e839910a763e49982f1b541f490dc173b9
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 | 25 +++++++++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7961bdc..9e4bdf0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,7 +1,7 @@
 variables:
     LAST_ABI_BREAK: 5cd4856c207e169aa535a9e32f3361b61af639b2
 
-build-fedora:
+build-fedora-soup2:
   image: fedora:latest
   before_script:
     # Undo delangification present in the Fedora Docker images
@@ -9,9 +9,30 @@ build-fedora:
     - 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
+    - dnf install -y glib2-devel json-glib-devel gtk-doc meson git gcc gcc-c++ glibc-devel libabigail
+    # soup2 specific tasks
+    - dnf install -y libsoup-devel
   script:
+    - meson _build -Dsoup2=true
+    - ninja -C _build install
+    - ninja -C _build test
+    - ./.ci/check-abi ${LAST_ABI_BREAK} $(git rev-parse HEAD)
+
+build-fedora-soup3:
+  image: fedora:rawhide
+  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 gtk-doc meson git gcc gcc-c++ glibc-devel libabigail
+    # soup3 specific tasks
+    - git clone --depth=1 https://gitlab.gnome.org/GNOME/libsoup.git && pushd libsoup
     - meson _build
     - ninja -C _build install
+  script:
+    - meson _build -Dsoup2=false
+    - ninja -C _build install
     - ninja -C _build test
     - ./.ci/check-abi ${LAST_ABI_BREAK} $(git rev-parse HEAD)


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]