diff options
| author | Jordan Petridis <jordan@centricular.com> | 2020-09-30 11:45:40 +0300 |
|---|---|---|
| committer | GStreamer Marge Bot <gitlab-merge-bot@gstreamer-foundation.org> | 2023-04-24 12:37:07 +0000 |
| commit | d6cd43a2ef5cf287084036fb2b4b457e6505b543 (patch) | |
| tree | 1f82ee6f48a34e8328ea738e2496dff2e9509bc7 /.gitlab-ci.yml | |
| parent | 187420a21b500cef3ab81248c160882b3add6d37 (diff) | |
| download | gstreamer-d6cd43a2ef5cf287084036fb2b4b457e6505b543.tar.gz | |
citemplate: move debugbuild option to variable
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>
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fd865ab4ec..1146ad0706 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -250,7 +250,7 @@ commitlint: - date -R - ci/scripts/handle-subprojects-cache.py subprojects/ - 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 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 timeout: '45min' variables: + BUILD_GST_DEBUG: "true" GST_WERROR: "true" MESON_ARGS: "${DEFAULT_MESON_ARGS} ${MESON_EXTRA_ARGS}" script: @@ -370,7 +371,8 @@ build nodebug fedora x86_64: - "trigger" - "fedora amd64 docker" 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: extends: '.build fedora x86_64' @@ -610,11 +612,11 @@ gstreamer-full-minimal static build: extends: 'gstreamer-full static build' stage: 'build' variables: + BUILD_GST_DEBUG: 'false' GST_WERROR: "true" BUILD_TYPE: "static" MESON_ARGS: > -Ddoc=disabled - -Dgstreamer:gst_debug=false -Dauto_features=disabled -Dgstreamer:check=enabled -Dtests=enabled |