gitlab-ci.yml: Don't build both qt5/qt6 on static builds

It doesn't make any sense since we can only link against one of the two
libraries

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/7455>
This commit is contained in:
Edward Hervey 2024-07-26 10:28:18 +02:00 committed by GStreamer Marge Bot
parent 10437c1677
commit b462d15fe0

View file

@ -428,7 +428,17 @@ build fedora gcc:
# #
# Disabling gstreamer-sharp tests because they download things as part of configure with # Disabling gstreamer-sharp tests because they download things as part of configure with
# nuget which frequently fails on the CI (possibly because we're hammering the site) # nuget which frequently fails on the CI (possibly because we're hammering the site)
MESON_ARGS: "${DEFAULT_MESON_ARGS} -Dvaapi=disabled -Dpython=auto -Dgst-editing-services:python=disabled -Dintrospection=disabled -Ddoc=disabled -Dgstreamer-sharp:tests=disabled" #
# Disabling building both qt5 and qt6 when doing static builds since we can only link against one
MESON_ARGS: >-
${DEFAULT_MESON_ARGS}
-Dvaapi=disabled
-Dpython=auto
-Dgst-editing-services:python=disabled
-Dintrospection=disabled
-Ddoc=disabled
-Dgstreamer-sharp:tests=disabled
-Dqt5=disabled -Dqt6=enabled
build fedora clang: build fedora clang:
extends: '.build fedora x86_64' extends: '.build fedora x86_64'
@ -449,6 +459,8 @@ build fedora clang:
# #
# Disabling gstreamer-sharp tests because they download things as part of configure with # Disabling gstreamer-sharp tests because they download things as part of configure with
# nuget which frequently fails on the CI (possibly because we're hammering the site) # nuget which frequently fails on the CI (possibly because we're hammering the site)
#
# Disabling building both qt5 and qt6 when doing static builds since we can only link against one
MESON_ARGS: >- MESON_ARGS: >-
${DEFAULT_MESON_ARGS} ${DEFAULT_MESON_ARGS}
-Dvaapi=disabled -Dvaapi=disabled
@ -456,6 +468,7 @@ build fedora clang:
-Dpython=disabled -Dpython=disabled
-Ddoc=disabled -Ddoc=disabled
-Dgstreamer-sharp:tests=disabled -Dgstreamer-sharp:tests=disabled
-Dqt5=disabled -Dqt6=enabled
build debian x86_64: build debian x86_64:
extends: extends:
@ -782,8 +795,11 @@ gstreamer-full static build:
stage: 'build' stage: 'build'
variables: variables:
BUILD_TYPE: "--default-library=static" BUILD_TYPE: "--default-library=static"
# Disabling building both qt5 and qt6 when doing static builds since we can only link against one
MESON_ARGS: >- MESON_ARGS: >-
-Ddoc=disabled -Ddoc=disabled
-Dqt5=disabled -Dqt6=enabled
SUBPROJECTS_CACHE_DIR: "/subprojects" SUBPROJECTS_CACHE_DIR: "/subprojects"
script: script:
- $CI_PROJECT_DIR/ci/scripts/build.sh build/ - $CI_PROJECT_DIR/ci/scripts/build.sh build/