mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-22 17:51:16 +00:00
Code Issues 1 Projects Releases Wiki Activity

citemplate: move debugbuild option to variable

Browse source 
Instead of appending it to the meson args string, have the
gstbuild template construct the meson args accordingly.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4281>
This commit is contained in:
Jordan Petridis 2020-09-30 11:45:40 +03:00 committed by GStreamer Marge Bot
parent 187420a21b
commit d6cd43a2ef
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
.gitlab-ci.yml
View file

@ -250,7 +250,7 @@ commitlint:
- date -R - date -R
- ci/scripts/handle-subprojects-cache.py subprojects/ - ci/scripts/handle-subprojects-cache.py subprojects/
- date -R - date -R
- export ARGS="--default-library=${BUILD_TYPE:-both} $MESON_ARGS" - export ARGS="--default-library=${BUILD_TYPE:-both} -Dgstreamer:gst_debug=${BUILD_GST_DEBUG:-true} $MESON_ARGS"
- |- - |-
if [ $GST_WERROR == "true" ]; then if [ $GST_WERROR == "true" ]; then
export ARGS="$ARGS $MESON_GST_WERROR" export ARGS="$ARGS $MESON_GST_WERROR"
@ -313,6 +313,7 @@ commitlint:
# Also need to take into account I/O of pulling docker images and uploading artifacts # Also need to take into account I/O of pulling docker images and uploading artifacts
timeout: '45min' timeout: '45min'
variables: variables:
BUILD_GST_DEBUG: "true"
GST_WERROR: "true" GST_WERROR: "true"
MESON_ARGS: "${DEFAULT_MESON_ARGS} ${MESON_EXTRA_ARGS}" MESON_ARGS: "${DEFAULT_MESON_ARGS} ${MESON_EXTRA_ARGS}"
script: script:
@ -370,7 +371,8 @@ build nodebug fedora x86_64:
- "trigger" - "trigger"
- "fedora amd64 docker" - "fedora amd64 docker"
variables: variables:
MESON_ARGS: "${DEFAULT_MESON_ARGS} -Dsharp=enabled -Dgstreamer:gst_debug=false -Domx=enabled -Dgst-omx:target=generic ${MESON_EXTRA_ARGS}" BUILD_GST_DEBUG: 'false'
MESON_ARGS: "${DEFAULT_MESON_ARGS} -Dsharp=enabled -Domx=enabled -Dgst-omx:target=generic ${MESON_EXTRA_ARGS}"
build clang fedora x86_64: build clang fedora x86_64:
extends: '.build fedora x86_64' extends: '.build fedora x86_64'
@ -610,11 +612,11 @@ gstreamer-full-minimal static build:
extends: 'gstreamer-full static build' extends: 'gstreamer-full static build'
stage: 'build' stage: 'build'
variables: variables:
BUILD_GST_DEBUG: 'false'
GST_WERROR: "true" GST_WERROR: "true"
BUILD_TYPE: "static" BUILD_TYPE: "static"
MESON_ARGS: > MESON_ARGS: >
-Ddoc=disabled -Ddoc=disabled
-Dgstreamer:gst_debug=false
-Dauto_features=disabled -Dauto_features=disabled
-Dgstreamer:check=enabled -Dgstreamer:check=enabled
-Dtests=enabled -Dtests=enabled