gitlab-ci.d/buildtest-template: Simplify the configure step
It's easier to use ${TARGETS:+--target-list="$TARGETS"} to add a --target-list parameter depending on whether the TARGETS variable is set or not. Message-Id: <20230207201447.566661-5-thuth@redhat.com> Reviewed-by: David Woodhouse <dwmw2@infradead.org> Signed-off-by: Thomas Huth <thuth@redhat.com>
This commit is contained in:
parent
2f5a375f60
commit
22ebcba061
@ -11,12 +11,10 @@
|
|||||||
fi
|
fi
|
||||||
- mkdir build
|
- mkdir build
|
||||||
- cd build
|
- cd build
|
||||||
- if test -n "$TARGETS";
|
- ../configure --enable-werror --disable-docs
|
||||||
then
|
${LD_JOBS:+--meson=git} ${TARGETS:+--target-list="$TARGETS"}
|
||||||
../configure --enable-werror --disable-docs ${LD_JOBS:+--meson=git} $CONFIGURE_ARGS --target-list="$TARGETS" ;
|
$CONFIGURE_ARGS ||
|
||||||
else
|
{ cat config.log meson-logs/meson-log.txt && exit 1; }
|
||||||
../configure --enable-werror --disable-docs ${LD_JOBS:+--meson=git} $CONFIGURE_ARGS ;
|
|
||||||
fi || { cat config.log meson-logs/meson-log.txt && exit 1; }
|
|
||||||
- if test -n "$LD_JOBS";
|
- if test -n "$LD_JOBS";
|
||||||
then
|
then
|
||||||
../meson/meson.py configure . -Dbackend_max_links="$LD_JOBS" ;
|
../meson/meson.py configure . -Dbackend_max_links="$LD_JOBS" ;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user