mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-12-22 08:17:01 +00:00
ci: Replace yaml anchor of simple build with a variable
Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4281>
This commit is contained in:
parent
20f9e67ac6
commit
68d042742a
1 changed files with 18 additions and 16 deletions
|
@ -40,7 +40,6 @@ variables:
|
|||
WINDOWS_IMAGE: "$CI_REGISTRY_IMAGE/$WINDOWS_AMD64_SUFFIX:$WINDOWS_TAG-$GST_UPSTREAM_BRANCH"
|
||||
WINDOWS_UPSTREAM_IMAGE: "$CI_REGISTRY/$FDO_UPSTREAM_REPO/$WINDOWS_AMD64_SUFFIX:$WINDOWS_TAG-$GST_UPSTREAM_BRANCH"
|
||||
|
||||
MESON_EXTRA_ARGS: ""
|
||||
DEFAULT_MESON_ARGS: >
|
||||
-Dlibnice:tests=disabled
|
||||
-Dlibnice:examples=disabled
|
||||
|
@ -58,6 +57,13 @@ variables:
|
|||
-Drs=disabled
|
||||
-Dgpl=enabled
|
||||
|
||||
SIMPLE_BUILD: >
|
||||
${DEFAULT_MESON_ARGS}
|
||||
-Dsharp=enabled
|
||||
-Domx=enabled
|
||||
-Dgst-omx:target=generic
|
||||
-Ddoc=disabled
|
||||
|
||||
MESON_GST_WERROR: >
|
||||
-Dgstreamer:werror=true
|
||||
-Dgst-plugins-base:werror=true
|
||||
|
@ -260,7 +266,7 @@ commitlint:
|
|||
- date -R
|
||||
- ci/scripts/handle-subprojects-cache.py subprojects/
|
||||
- date -R
|
||||
- export ARGS="--default-library=${BUILD_TYPE:-both} -Dgstreamer:gst_debug=${BUILD_GST_DEBUG:-true} $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"
|
||||
|
@ -305,14 +311,6 @@ commitlint:
|
|||
- subprojects/gstreamer-vaapi/**/*
|
||||
- subprojects/gst-rtsp-server/**/*
|
||||
|
||||
.simple_fedora_build: &simple_build >-
|
||||
${DEFAULT_MESON_ARGS}
|
||||
-Dsharp=enabled
|
||||
-Domx=enabled
|
||||
-Dgst-omx:target=generic
|
||||
-Ddoc=disabled
|
||||
${MESON_BUILDTYPE_ARGS}
|
||||
|
||||
.build:
|
||||
stage: 'build'
|
||||
extends:
|
||||
|
@ -325,7 +323,7 @@ commitlint:
|
|||
variables:
|
||||
BUILD_GST_DEBUG: "true"
|
||||
GST_WERROR: "true"
|
||||
MESON_ARGS: "${DEFAULT_MESON_ARGS} ${MESON_EXTRA_ARGS}"
|
||||
MESON_ARGS: "${DEFAULT_MESON_ARGS}"
|
||||
script:
|
||||
- *build
|
||||
- ./gst-env.py gst-inspect-1.0 --version
|
||||
|
@ -355,7 +353,7 @@ commitlint:
|
|||
- "fedora amd64 docker"
|
||||
variables:
|
||||
GST_WERROR: "true"
|
||||
MESON_ARGS: *simple_build
|
||||
MESON_ARGS: "${SIMPLE_BUILD}"
|
||||
|
||||
script:
|
||||
- *build
|
||||
|
@ -544,7 +542,7 @@ build msys2 :
|
|||
- "trigger"
|
||||
variables:
|
||||
GST_WERROR: "true"
|
||||
MESON_ARGS: *simple_build
|
||||
MESON_ARGS: "${SIMPLE_BUILD}"
|
||||
|
||||
# Disable colored output to avoid weird rendering issues
|
||||
GST_DEBUG_NO_COLOR: "true"
|
||||
|
@ -607,7 +605,8 @@ integration testsuites fedora:
|
|||
extends: '.test fedora x86_64'
|
||||
parallel: 8
|
||||
variables:
|
||||
MESON_EXTRA_ARGS: >
|
||||
MESON_ARGS: >
|
||||
${SIMPLE_BUILD}
|
||||
-Domx=disabled
|
||||
-Dsharp=disabled
|
||||
-Dvaapi=disabled
|
||||
|
@ -776,8 +775,11 @@ valgrind ges:
|
|||
.documentation:
|
||||
extends: '.build fedora x86_64'
|
||||
variables:
|
||||
MESON_ARGS: *simple_build
|
||||
MESON_EXTRA_ARGS: "-Ddoc=enabled -Drs=enabled -Dgst-docs:fatal_warnings=true"
|
||||
MESON_ARGS: >
|
||||
${SIMPLE_BUILD}
|
||||
-Ddoc=enabled
|
||||
-Drs=enabled
|
||||
-Dgst-docs:fatal_warnings=true
|
||||
# Disable werror for the docs build, we don't need it
|
||||
GST_WERROR: 'false'
|
||||
CI_ARTIFACTS_URL: "${CI_PROJECT_URL}/-/jobs/${CI_JOB_ID}/artifacts/raw/"
|
||||
|
|
Loading…
Reference in a new issue