summaryrefslogtreecommitdiff
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
authorJordan Petridis <jordan@centricular.com>2023-10-24 09:29:47 +0300
committerGStreamer Marge Bot <gitlab-merge-bot@gstreamer-foundation.org>2023-11-18 16:37:07 +0000
commit7a9a8d421f6ff09168fc86460fa918e0a6fbd02b (patch)
tree9598411eacc66b7474465179a2db23d104c6a76c /.gitlab-ci.yml
parentd52cdbc65b037193a2af992ec4f614bb76bc7345 (diff)
ci: Remove clang workaround from the prallel matrix
Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5543>
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml18
1 files changed, 1 insertions, 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,25 +415,9 @@ build fedora clang:
parallel:
matrix:
- BUILD_TYPE: [ "--default-library=shared", "--default-library=both"]
- BUILD_GST_DEBUG: ["-Dgstreamer:gst_debug=true"]
- 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:
- # ^
+ BUILD_GST_DEBUG: ["-Dgstreamer:gst_debug=true", "-Dgstreamer:gst_debug=false"]
MESON_ARGS: >-
${SIMPLE_BUILD}
- -Dintrospection=disabled
- -Dpython=disabled
--force-fallback-for=glib
- BUILD_TYPE: ["--default-library=static"]