From 7a9a8d421f6ff09168fc86460fa918e0a6fbd02b Mon Sep 17 00:00:00 2001 From: Jordan Petridis Date: Tue, 24 Oct 2023 09:29:47 +0300 Subject: [PATCH] ci: Remove clang workaround from the prallel matrix Part-of: --- .gitlab-ci.yml | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2845f165a3..4971a0f78b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -415,27 +415,11 @@ build fedora clang: parallel: matrix: - BUILD_TYPE: [ "--default-library=shared", "--default-library=both"] - BUILD_GST_DEBUG: ["-Dgstreamer:gst_debug=true"] + BUILD_GST_DEBUG: ["-Dgstreamer:gst_debug=true", "-Dgstreamer:gst_debug=false"] MESON_ARGS: >- ${SIMPLE_BUILD} --force-fallback-for=glib - - BUILD_TYPE: [ "--default-library=shared", "--default-library=both"] - BUILD_GST_DEBUG: ["-Dgstreamer:gst_debug=false"] - # FIXME: - # clang complains about the gir files when gst_debug is false: - # We can merge the two parallel: matrix after - # - # [1352/5496] Generating subprojects/gstreamer/gst/Gst-1.0.gir with a custom command - # ../subprojects/gstreamer/gst/gstchildproxy.h:57: Error: Gst: identifier not found on the first line: - # * GstChildProxyInterface.get_child_by_name: - # ^ - MESON_ARGS: >- - ${SIMPLE_BUILD} - -Dintrospection=disabled - -Dpython=disabled - --force-fallback-for=glib - - BUILD_TYPE: ["--default-library=static"] BUILD_GST_DEBUG: ["-Dgstreamer:gst_debug=true", "-Dgstreamer:gst_debug=false"] # VAAPI can't be build statically yet