ci: Eliminate newlines from variable values

The newlines existed because > preserves the trailing newline.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4939>
This commit is contained in:
Nirbheek Chauhan 2023-07-07 08:49:14 +05:30
parent df57fffed7
commit c81040c901

View file

@ -40,7 +40,7 @@ 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"
DEFAULT_MESON_ARGS: > DEFAULT_MESON_ARGS: >-
-Dlibnice:tests=disabled -Dlibnice:tests=disabled
-Dlibnice:examples=disabled -Dlibnice:examples=disabled
-Dlibnice:gupnp=disabled -Dlibnice:gupnp=disabled
@ -58,7 +58,7 @@ variables:
-Drs=disabled -Drs=disabled
-Dgpl=enabled -Dgpl=enabled
SIMPLE_BUILD: > SIMPLE_BUILD: >-
${DEFAULT_MESON_ARGS} ${DEFAULT_MESON_ARGS}
-Dsharp=enabled -Dsharp=enabled
-Domx=enabled -Domx=enabled
@ -419,7 +419,7 @@ build fedora clang:
- "windows amd64 docker" - "windows amd64 docker"
timeout: '45min' timeout: '45min'
variables: variables:
MESON_ARGS: > MESON_ARGS: >-
${DEFAULT_MESON_ARGS} ${DEFAULT_MESON_ARGS}
-Dpython=disabled -Dpython=disabled
-Dlibav=disabled -Dlibav=disabled
@ -427,9 +427,6 @@ build fedora clang:
-Dgst-plugins-base:pango=enabled -Dgst-plugins-base:pango=enabled
-Dgst-plugins-good:cairo=enabled -Dgst-plugins-good:cairo=enabled
-Dgst-plugins-bad:d3d11-wgc=enabled -Dgst-plugins-bad:d3d11-wgc=enabled
# Needs to not be empty otherwise the newline -> space replace command in
# `script:` will fail
MESON_CROSS_ARGS: ' '
rules: rules:
# If this matches, it means the pipeline is running against either the main # If this matches, it means the pipeline is running against either the main
# or a stable branch, so make it manual # or a stable branch, so make it manual
@ -484,7 +481,7 @@ build vs2022 arm64:
ARCH: 'arm64' ARCH: 'arm64'
# pango pulls in cairo which pulls in pixman which doesn't build because of # pango pulls in cairo which pulls in pixman which doesn't build because of
# https://github.com/mesonbuild/meson/issues/9889 # https://github.com/mesonbuild/meson/issues/9889
MESON_CROSS_ARGS: > MESON_CROSS_ARGS: >-
-Dgst-plugins-base:pango=disabled -Dgst-plugins-base:pango=disabled
-Dgst-plugins-good:cairo=disabled -Dgst-plugins-good:cairo=disabled
-Dgst-devtools:cairo=disabled -Dgst-devtools:cairo=disabled
@ -494,10 +491,6 @@ build vs2022 arm64:
--native-file ci/meson/vs2022-x64-native.ini --native-file ci/meson/vs2022-x64-native.ini
script: script:
- !reference [".build windows", "script"] - !reference [".build windows", "script"]
# For some reason, options are separated by newline instead of space, so we
# have to replace them first.
- $env:MESON_ARGS = $env:MESON_ARGS.replace("`n"," ")
- $env:MESON_CROSS_ARGS = $env:MESON_CROSS_ARGS.replace("`n"," ")
# Setting up a cross build with MSVC is still non-trivial because # Setting up a cross build with MSVC is still non-trivial because
# the --vsenv argument cannot be used to set it up # the --vsenv argument cannot be used to set it up
- echo $env:MESON_ARGS - echo $env:MESON_ARGS
@ -596,7 +589,7 @@ integration testsuites fedora:
extends: '.test fedora x86_64' extends: '.test fedora x86_64'
parallel: 8 parallel: 8
variables: variables:
MESON_ARGS: > MESON_ARGS: >-
${SIMPLE_BUILD} ${SIMPLE_BUILD}
-Domx=disabled -Domx=disabled
-Dsharp=disabled -Dsharp=disabled
@ -628,7 +621,7 @@ gstreamer-full static build:
stage: 'build' stage: 'build'
variables: variables:
BUILD_TYPE: "static" BUILD_TYPE: "static"
MESON_ARGS: > MESON_ARGS: >-
-Ddoc=disabled -Ddoc=disabled
script: script:
@ -642,7 +635,7 @@ gstreamer-full-minimal static build:
BUILD_GST_DEBUG: 'false' BUILD_GST_DEBUG: 'false'
GST_WERROR: "true" GST_WERROR: "true"
BUILD_TYPE: "static" BUILD_TYPE: "static"
MESON_ARGS: > MESON_ARGS: >-
-Ddoc=disabled -Ddoc=disabled
-Dauto_features=disabled -Dauto_features=disabled
-Dgstreamer:check=enabled -Dgstreamer:check=enabled
@ -766,7 +759,7 @@ valgrind ges:
.documentation: .documentation:
extends: '.build fedora x86_64' extends: '.build fedora x86_64'
variables: variables:
MESON_ARGS: > MESON_ARGS: >-
${SIMPLE_BUILD} ${SIMPLE_BUILD}
-Ddoc=enabled -Ddoc=enabled
-Drs=enabled -Drs=enabled