ci: implement unified sections

in after_script, variable $SCRIPTS_DIR is lost

Acked-by: Daniel Stone <daniels@collabora.com>
Signed-off-by: David Heidelberg <david.heidelberg@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20272>
This commit is contained in:
David Heidelberg
2022-12-11 17:46:41 +01:00
committed by Marge Bot
parent 5bfc17b2da
commit 4cc0cec473
20 changed files with 192 additions and 59 deletions

View File

@@ -1,4 +1,6 @@
#!/bin/bash
#!/usr/bin/env bash
section_switch meson-configure "meson: configure"
set -e
set -o xtrace
@@ -81,11 +83,17 @@ meson setup _build \
${EXTRA_OPTION}
cd _build
meson configure
section_switch meson-build "meson: build"
if command -V mold &> /dev/null ; then
mold --run ninja
else
ninja
fi
section_switch meson-test "meson: test"
LC_ALL=C.UTF-8 meson test --num-processes ${FDO_CI_CONCURRENT:-4} --print-errorlogs ${MESON_TEST_ARGS}
if command -V mold &> /dev/null ; then
mold --run ninja install
@@ -93,3 +101,4 @@ else
ninja install
fi
cd ..
section_end meson-test