Stop a bit more quickly on a failure when using Ninja. (#18101)
Austin S. Hemmelgarn committed
Jul 15, 2024 at 06:56 UTC
4ea932e23d57b5995b1ddfbd67ff424cc0451104
2 files changed
+4
-4
netdata-installer.sh
+1
-1
@@ -511,7 +511,7 @@ fi
511
512
CMAKE_OPTS="${ninja:+-G Ninja}"
513
BUILD_OPTS="VERBOSE=1"
514
-[ -n "${ninja}" ] && BUILD_OPTS="-v"
514
+[ -n "${ninja}" ] && BUILD_OPTS="-k 1"
515
516
if [ ${DONOTWAIT} -eq 0 ]; then
517
if [ -n "${NETDATA_PREFIX}" ]; then
packaging/build-package.sh
+3
-3
@@ -18,7 +18,7 @@ SCRIPT_SOURCE="$(
18
)"
19
SOURCE_DIR="$(dirname "$(dirname "${SCRIPT_SOURCE}")")"
20
21
-CMAKE_ARGS="-S ${SOURCE_DIR} -B ${BUILD_DIR} -G Ninja"
21
+CMAKE_ARGS="-S ${SOURCE_DIR} -B ${BUILD_DIR}"
22
23
add_cmake_option() {
24
CMAKE_ARGS="${CMAKE_ARGS} -D${1}=${2}"
@@ -89,8 +89,8 @@ else
89
fi
90
91
# shellcheck disable=SC2086
92
-cmake ${CMAKE_ARGS}
93
-cmake --build "${BUILD_DIR}" --parallel "$(nproc)"
92
+cmake ${CMAKE_ARGS} -G Ninja
93
+cmake --build "${BUILD_DIR}" --parallel "$(nproc)" -- -k 1
94
95
if [ "${ENABLE_SENTRY}" = "true" ] && [ "${UPLOAD_SENTRY}" = "true" ]; then
96
sentry-cli debug-files upload -o netdata-inc -p netdata-agent --force-foreground --log-level=debug --wait --include-sources build/netdata