From 9dabe3d99150cfb525d69c8d66ae0c9db69a3a8b Mon Sep 17 00:00:00 2001 From: George Kiagiadakis Date: Mon, 28 Jun 2021 17:38:12 +0300 Subject: [PATCH] ci: add ubuntu 20.04 builds and test some more option combinations - on fedora: with and without docs - on ubuntu: with and without introspection - on fedora: with lua 5.4 from the submodule - on ubuntu: with lua 5.3 from the system --- .gitlab-ci.yml | 74 ++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 69 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ee6f3ae9..35edc837 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -17,6 +17,9 @@ include: - project: 'freedesktop/ci-templates' ref: *templates_sha file: '/templates/fedora.yml' + - project: 'freedesktop/ci-templates' + ref: *templates_sha + file: '/templates/ubuntu.yml' .fedora: variables: @@ -47,6 +50,28 @@ include: pip3 install lxml Sphinx sphinx-rtd-theme breathe ; dnf -y install glib2-doc --setopt='tsflags=' +.ubuntu: + variables: + # Update this tag when you want to trigger a rebuild + FDO_DISTRIBUTION_TAG: '2021-06-28.2' + FDO_DISTRIBUTION_VERSION: '20.04' + FDO_DISTRIBUTION_PACKAGES: >- + debhelper-compat + findutils + git + ninja-build + pkg-config + python3-pip + dbus + libdbus-1-dev + libglib2.0-dev + liblua5.3-dev + libgirepository1.0-dev + doxygen + python3-lxml + FDO_DISTRIBUTION_EXEC: >- + pip3 install meson + .coverity: variables: FDO_REPO_SUFFIX: 'coverity' @@ -86,7 +111,7 @@ include: -Dvulkan=disabled -Dgstreamer=disabled -Dsystemd=disabled -Ddocs=disabled -Dman=disabled -Dexamples=disabled -Dpw-cat=disabled -Dsdl2=disabled -Dsndfile=disabled -Dlibpulse=disabled -Davahi=disabled - -Decho-cancel-webrtc=disabled -Dmedia-session=disabled + -Decho-cancel-webrtc=disabled -Dsession-managers=[] -Dvideotestsrc=enabled -Daudiotestsrc=enabled -Dtest=enabled - ninja -C "$PW_BUILD_DIR" install # misc environment only for wireplumber @@ -95,8 +120,7 @@ include: - export PKG_CONFIG_PATH="$(dirname $(find "$PREFIX" -name 'libpipewire-*.pc')):$PKG_CONFIG_PATH" script: # Build wireplumber - - meson "$WP_BUILD_DIR" . --prefix="$PREFIX" - -Dintrospection=enabled -Ddoc=enabled + - meson "$WP_BUILD_DIR" . --prefix="$PREFIX" $BUILD_OPTIONS - cd "$WP_BUILD_DIR" - ninja - ninja test @@ -116,6 +140,14 @@ container_fedora: variables: GIT_STRATEGY: none +container_ubuntu: + extends: + - .ubuntu + - .fdo.container-build@ubuntu + stage: container + variables: + GIT_STRATEGY: none + container_coverity: extends: - .fedora @@ -125,13 +157,45 @@ container_coverity: variables: GIT_STRATEGY: none -build_on_fedora: +build_on_fedora_with_docs: extends: - .fedora - .not_coverity - .fdo.distribution-image@fedora - .build stage: build + variables: + BUILD_OPTIONS: -Dintrospection=enabled -Ddoc=enabled -Dsystem-lua=false + +build_on_fedora_no_docs: + extends: + - .fedora + - .not_coverity + - .fdo.distribution-image@fedora + - .build + stage: build + variables: + BUILD_OPTIONS: -Dintrospection=enabled -Ddoc=disabled -Dsystem-lua=false + +build_on_ubuntu_with_gir: + extends: + - .ubuntu + - .not_coverity + - .fdo.distribution-image@ubuntu + - .build + stage: build + variables: + BUILD_OPTIONS: -Dintrospection=enabled -Ddoc=disabled -Dsystem-lua=true + +build_on_ubuntu_no_gir: + extends: + - .ubuntu + - .not_coverity + - .fdo.distribution-image@ubuntu + - .build + stage: build + variables: + BUILD_OPTIONS: -Dintrospection=disabled -Ddoc=disabled -Dsystem-lua=true build_with_coverity: extends: @@ -166,7 +230,7 @@ pages: - .not_coverity stage: pages dependencies: - - build_on_fedora + - build_on_fedora_with_docs script: - mkdir public - cp -R prefix-*/share/doc/wireplumber/html/* public/