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:
Jordan Petridis 2023-03-27 16:34:35 +03:00 committed by GStreamer Marge Bot
parent 20f9e67ac6
commit 68d042742a

View file

@ -40,7 +40,6 @@ variables:
WINDOWS_IMAGE: "$CI_REGISTRY_IMAGE/$WINDOWS_AMD64_SUFFIX:$WINDOWS_TAG-$GST_UPSTREAM_BRANCH" 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" WINDOWS_UPSTREAM_IMAGE: "$CI_REGISTRY/$FDO_UPSTREAM_REPO/$WINDOWS_AMD64_SUFFIX:$WINDOWS_TAG-$GST_UPSTREAM_BRANCH"
MESON_EXTRA_ARGS: ""
DEFAULT_MESON_ARGS: > DEFAULT_MESON_ARGS: >
-Dlibnice:tests=disabled -Dlibnice:tests=disabled
-Dlibnice:examples=disabled -Dlibnice:examples=disabled
@ -58,6 +57,13 @@ variables:
-Drs=disabled -Drs=disabled
-Dgpl=enabled -Dgpl=enabled
SIMPLE_BUILD: >
${DEFAULT_MESON_ARGS}
-Dsharp=enabled
-Domx=enabled
-Dgst-omx:target=generic
-Ddoc=disabled
MESON_GST_WERROR: > MESON_GST_WERROR: >
-Dgstreamer:werror=true -Dgstreamer:werror=true
-Dgst-plugins-base:werror=true -Dgst-plugins-base:werror=true
@ -260,7 +266,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} -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 if [ $GST_WERROR == "true" ]; then
export ARGS="$ARGS $MESON_GST_WERROR" export ARGS="$ARGS $MESON_GST_WERROR"
@ -305,14 +311,6 @@ commitlint:
- subprojects/gstreamer-vaapi/**/* - subprojects/gstreamer-vaapi/**/*
- subprojects/gst-rtsp-server/**/* - 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: .build:
stage: 'build' stage: 'build'
extends: extends:
@ -325,7 +323,7 @@ commitlint:
variables: variables:
BUILD_GST_DEBUG: "true" BUILD_GST_DEBUG: "true"
GST_WERROR: "true" GST_WERROR: "true"
MESON_ARGS: "${DEFAULT_MESON_ARGS} ${MESON_EXTRA_ARGS}" MESON_ARGS: "${DEFAULT_MESON_ARGS}"
script: script:
- *build - *build
- ./gst-env.py gst-inspect-1.0 --version - ./gst-env.py gst-inspect-1.0 --version
@ -355,7 +353,7 @@ commitlint:
- "fedora amd64 docker" - "fedora amd64 docker"
variables: variables:
GST_WERROR: "true" GST_WERROR: "true"
MESON_ARGS: *simple_build MESON_ARGS: "${SIMPLE_BUILD}"
script: script:
- *build - *build
@ -544,7 +542,7 @@ build msys2 :
- "trigger" - "trigger"
variables: variables:
GST_WERROR: "true" GST_WERROR: "true"
MESON_ARGS: *simple_build MESON_ARGS: "${SIMPLE_BUILD}"
# Disable colored output to avoid weird rendering issues # Disable colored output to avoid weird rendering issues
GST_DEBUG_NO_COLOR: "true" GST_DEBUG_NO_COLOR: "true"
@ -607,7 +605,8 @@ integration testsuites fedora:
extends: '.test fedora x86_64' extends: '.test fedora x86_64'
parallel: 8 parallel: 8
variables: variables:
MESON_EXTRA_ARGS: > MESON_ARGS: >
${SIMPLE_BUILD}
-Domx=disabled -Domx=disabled
-Dsharp=disabled -Dsharp=disabled
-Dvaapi=disabled -Dvaapi=disabled
@ -776,8 +775,11 @@ valgrind ges:
.documentation: .documentation:
extends: '.build fedora x86_64' extends: '.build fedora x86_64'
variables: variables:
MESON_ARGS: *simple_build MESON_ARGS: >
MESON_EXTRA_ARGS: "-Ddoc=enabled -Drs=enabled -Dgst-docs:fatal_warnings=true" ${SIMPLE_BUILD}
-Ddoc=enabled
-Drs=enabled
-Dgst-docs:fatal_warnings=true
# Disable werror for the docs build, we don't need it # Disable werror for the docs build, we don't need it
GST_WERROR: 'false' GST_WERROR: 'false'
CI_ARTIFACTS_URL: "${CI_PROJECT_URL}/-/jobs/${CI_JOB_ID}/artifacts/raw/" CI_ARTIFACTS_URL: "${CI_PROJECT_URL}/-/jobs/${CI_JOB_ID}/artifacts/raw/"