diff options
| author | Bastien Nocera <hadess@hadess.net> | 2022-07-04 17:02:55 +0200 |
|---|---|---|
| committer | Bastien Nocera <hadess@hadess.net> | 2022-07-05 14:32:47 +0200 |
| commit | fccc61863b4e049459cfe2213edb97afb95d960a (patch) | |
| tree | 9bbea00709eefa3bcb7e1aaceb745b95c129d181 | |
| parent | db7e78fe36fdc9e04afbf2a267ddd3a5bbb989ea (diff) | |
| download | grilo-fccc61863b4e049459cfe2213edb97afb95d960a.tar.gz | |
ci: Build both soup3 and soup2 variants
And check ABI against both variants.
| -rw-r--r-- | .gitlab-ci.yml | 25 |
1 files changed, 20 insertions, 5 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3dfbc1b..7204729 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,12 +16,14 @@ variables: gcc-c++ glibc-devel libabigail + SOUP2_DEPS: libsoup-devel + SOUP3_DEPS: libsoup3-devel LAST_ABI_BREAK: 60d135ef64f16671bb0ab4079ecbc59bdc32cbc7 build_stable: before_script: - dnf update -y --nogpgcheck - - dnf install -y --nogpgcheck $DEPENDENCIES + - dnf install -y --nogpgcheck $DEPENDENCIES $SOUP3_DEPS script: - meson . _build --prefix=/usr - ninja -C _build @@ -32,11 +33,25 @@ 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 + - 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 --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=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 -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 + # For the soup2 build + - dnf install -y --nogpgcheck $SOUP2_DEPS + - 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) |