build: jobs must return in failure when a dependency build fails.

While this is the job of `set -e`, putting parts of the script in shell
functions hid error returns in the build-deps-msys2 script.
Cf. #10729.

For the build-gimp-crossroad script, let's just add `set -e`.
Cf. #10725.
This commit is contained in:
Jehan 2024-02-01 14:56:31 +01:00
parent a07b3c803b
commit 0902e45901
2 changed files with 7 additions and 6 deletions

View File

@ -52,7 +52,7 @@ export XDG_DATA_DIRS="${GIMP_PREFIX}/share:${MSYSTEM_PREFIX}/share/"
clone_or_pull() {
if [ ! -d "_${1}" ]; then
git clone --depth=${GIT_DEPTH} https://gitlab.gnome.org/GNOME/${1}.git _${1}
git clone --depth=${GIT_DEPTH} https://gitlab.gnome.org/GNOME/${1}.git _${1} || exit 1
else
cd _${1} && git pull && cd ..
fi
@ -67,13 +67,12 @@ configure_or_build()
{
if [ ! -f "_${1}/_build/build.ninja" ]; then
mkdir -p _${1}/_build${ARTIFACTS_SUFFIX} && cd _${1}/_build${ARTIFACTS_SUFFIX}
meson setup .. -Dprefix="${GIMP_PREFIX}" \
$2
ninja && ninja install
(meson setup .. -Dprefix="${GIMP_PREFIX}" $2 && \
ninja && ninja install) || exit 1
cd ../..
else
cd _${1}/_build${ARTIFACTS_SUFFIX}
ninja && ninja install
(ninja && ninja install) || exit 1
cd ../..
fi
}
@ -89,4 +88,4 @@ if [[ "$BUILD_TYPE" != "CI_NATIVE" ]]; then
mv _babl ~
mv _gegl ~
mv "${GIMP_PREFIX}" ~
fi
fi

View File

@ -1,3 +1,5 @@
set -e
if [[ "x$CROSSROAD_PLATFORM" = "xw64" ]]; then
export ARTIFACTS_SUFFIX="-x64"
export MESON_OPTIONS=""