[grilo/wip/hadess/soup3: 3/3] ci: Build both soup3 and soup2 variants
- From: Bastien Nocera <hadess src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [grilo/wip/hadess/soup3: 3/3] ci: Build both soup3 and soup2 variants
- Date: Mon, 4 Jul 2022 15:27:55 +0000 (UTC)
commit 421840c8148c02c66b07e1fec2623dc26e9a4b55
Author: Bastien Nocera <hadess hadess net>
Date: Mon Jul 4 17:02:55 2022 +0200
ci: Build both soup3 and soup2 variants
And check ABI against both variants.
.gitlab-ci.yml | 21 +++++++++++++++++----
1 file changed, 17 insertions(+), 4 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3dfbc1b..46337fa 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,7 +6,6 @@ variables:
gtk-doc
gobject-introspection-devel
libxml2-devel
- libsoup-devel
glib2-devel
gtk3-devel
liboauth-devel
@@ -17,6 +16,8 @@ variables:
gcc-c++
glibc-devel
libabigail
+ SOUP2_DEPS: libsoup-devel
+ SOUP3_DEPS: libsoup3-devel
LAST_ABI_BREAK: 60d135ef64f16671bb0ab4079ecbc59bdc32cbc7
build_stable:
@@ -32,11 +33,23 @@ build_stable:
build_no_optional_libs:
before_script:
- dnf update -y --nogpgcheck
- - dnf install -y --nogpgcheck $DEPENDENCIES
+ - dnf install -y --nogpgcheck $DEPENDENCIES $SOUP2_DEPS
+ script:
+ - meson . _build --prefix=/usr -Denable-grl-net=true -Denable-grl-pls=true -Dsoup3=false
+ - ninja -C _build
+ - ninja -C _build install
+ - ninja -C _build test
+ - curl https://gitlab.freedesktop.org/hadess/check-abi/-/raw/main/contrib/check-abi-fedora.sh | bash
+ - check-abi --old-parameters="-Denable-grl-net=true -Denable-grl-pls=true"
--new-parameters="-Denable-grl-net=true -Denable-grl-pls=true -Dsoup3=false" ${LAST_ABI_BREAK} $(git
rev-parse HEAD)
+
+build_no_optional_libs_soup3:
+ before_script:
+ - dnf update -y --nogpgcheck
+ - dnf install -y --nogpgcheck $DEPENDENCIES $SOUP3_DEPS
script:
- - meson . _build --prefix=/usr -Denable-grl-net=true -Denable-grl-pls=true
+ - meson . _build --prefix=/usr -Denable-grl-net=true -Denable-grl-pls=true -Dsoup3=true
- ninja -C _build
- ninja -C _build install
- ninja -C _build test
- curl https://gitlab.freedesktop.org/hadess/check-abi/-/raw/main/contrib/check-abi-fedora.sh | bash
- - check-abi --parameters="-Denable-grl-net=true -Denable-grl-pls=true" ${LAST_ABI_BREAK} $(git rev-parse
HEAD)
+ - check-abi --old-parameters="-Denable-grl-net=true -Denable-grl-pls=true"
--new-parameters="-Denable-grl-net=true -Denable-grl-pls=true -Dsoup3=true" ${LAST_ABI_BREAK} $(git rev-parse
HEAD)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]