From e73fc26cf643608ccd3008efbc30a0e80a9a379a Mon Sep 17 00:00:00 2001 From: Thibault Saunier Date: Tue, 12 Oct 2021 23:28:57 -0300 Subject: [PATCH] ci: Build introspection support on static builds But disable python in GES as it is not supported on static builds Part-of: --- .gitlab-ci.yml | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a1bf1717f4..a94b712646 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -361,12 +361,20 @@ build nodebug fedora x86_64: build static fedora x86_64: extends: '.build fedora x86_64' variables: - MESON_BUILDTYPE_ARGS: "--default-library=static -Dintrospection=disabled -Ddoc=disabled" + MESON_BUILDTYPE_ARGS: > + --default-library=static + -Dintrospection=disabled + -Ddoc=disabled + -Dpython=auto build static nodebug fedora x86_64: extends: 'build nodebug fedora x86_64' variables: - MESON_BUILDTYPE_ARGS: "--default-library=static -Dintrospection=disabled -Ddoc=disabled" + MESON_BUILDTYPE_ARGS: > + --default-library=static + -Dintrospection=disabled + -Ddoc=disabled + -Dpython=auto build clang fedora x86_64: extends: '.build fedora x86_64' @@ -525,15 +533,14 @@ integration testsuites fedora: TEST_SUITE: "validate ges" # gstreamer-full: -# introspection has been disabled as the static build does not support it. -# See https://gitlab.freedesktop.org/gstreamer/gst-build/-/issues/162 gstreamer-full: extends: 'build static fedora x86_64' stage: integrate variables: MESON_ARGS: > --default-library=static - -Dintrospection=disabled + -Ddoc=disabled + -Dgst-editing-services:python=disabled $MESON_GST_WERROR rules: # If this matches, it means the pipeline is running against either the main