mirror of https://github.com/GNOME/gimp.git
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:
parent
a07b3c803b
commit
0902e45901
|
@ -52,7 +52,7 @@ export XDG_DATA_DIRS="${GIMP_PREFIX}/share:${MSYSTEM_PREFIX}/share/"
|
||||||
|
|
||||||
clone_or_pull() {
|
clone_or_pull() {
|
||||||
if [ ! -d "_${1}" ]; then
|
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
|
else
|
||||||
cd _${1} && git pull && cd ..
|
cd _${1} && git pull && cd ..
|
||||||
fi
|
fi
|
||||||
|
@ -67,13 +67,12 @@ configure_or_build()
|
||||||
{
|
{
|
||||||
if [ ! -f "_${1}/_build/build.ninja" ]; then
|
if [ ! -f "_${1}/_build/build.ninja" ]; then
|
||||||
mkdir -p _${1}/_build${ARTIFACTS_SUFFIX} && cd _${1}/_build${ARTIFACTS_SUFFIX}
|
mkdir -p _${1}/_build${ARTIFACTS_SUFFIX} && cd _${1}/_build${ARTIFACTS_SUFFIX}
|
||||||
meson setup .. -Dprefix="${GIMP_PREFIX}" \
|
(meson setup .. -Dprefix="${GIMP_PREFIX}" $2 && \
|
||||||
$2
|
ninja && ninja install) || exit 1
|
||||||
ninja && ninja install
|
|
||||||
cd ../..
|
cd ../..
|
||||||
else
|
else
|
||||||
cd _${1}/_build${ARTIFACTS_SUFFIX}
|
cd _${1}/_build${ARTIFACTS_SUFFIX}
|
||||||
ninja && ninja install
|
(ninja && ninja install) || exit 1
|
||||||
cd ../..
|
cd ../..
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
@ -89,4 +88,4 @@ if [[ "$BUILD_TYPE" != "CI_NATIVE" ]]; then
|
||||||
mv _babl ~
|
mv _babl ~
|
||||||
mv _gegl ~
|
mv _gegl ~
|
||||||
mv "${GIMP_PREFIX}" ~
|
mv "${GIMP_PREFIX}" ~
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -1,3 +1,5 @@
|
||||||
|
set -e
|
||||||
|
|
||||||
if [[ "x$CROSSROAD_PLATFORM" = "xw64" ]]; then
|
if [[ "x$CROSSROAD_PLATFORM" = "xw64" ]]; then
|
||||||
export ARTIFACTS_SUFFIX="-x64"
|
export ARTIFACTS_SUFFIX="-x64"
|
||||||
export MESON_OPTIONS=""
|
export MESON_OPTIONS=""
|
||||||
|
|
Loading…
Reference in New Issue