Merge remote-tracking branch 'upstream/maint'

This commit is contained in:
Christopher Lam
2020-03-01 21:31:21 +08:00
11 changed files with 116 additions and 150 deletions

View File

@@ -4,6 +4,6 @@ run echo en_US.UTF-8 UTF-8 >> /etc/locale.gen
run echo en_GB.UTF-8 UTF-8 >> /etc/locale.gen
run echo fr_FR.UTF-8 UTF-8 >> /etc/locale.gen
run locale-gen
copy arch-testscript afterfailure commonbuild /
run chmod +x /arch-testscript /afterfailure /commonbuild
copy arch-testscript commonbuild /
run chmod +x /arch-testscript /commonbuild
entrypoint /arch-testscript

View File

@@ -5,15 +5,16 @@ mkdir -p "$HOME"/.local/share
mkdir build
cd build
export TZ="America/Los_Angeles"
export CTEST_OUTPUT_ON_FAILURE=On
if [[ "$BUILDTYPE" == "cmake-make" ]]; then
cmake ../gnucash $PLATFORM_CMAKE_OPTS
make -j 4
make check || ../afterfailure
make check
elif [[ "$BUILDTYPE" == "cmake-ninja" ]]; then
cmake ../gnucash -DWITH_PYTHON=ON -DCMAKE_BUILD_TYPE=debug -G Ninja $PLATFORM_CMAKE_OPTS
ninja
ninja check || ../afterfailure;
ninja check
else
echo "Unknown buildtype: \"$BUILDTYPE\". Not building."
fi