mirror of
https://github.com/netdata/netdata.git
synced 2025-04-13 09:11:50 +00:00
Stop a bit more quickly on a failure when using Ninja. (#18101)
This commit is contained in:
parent
32b031c555
commit
4ea932e23d
2 changed files with 4 additions and 4 deletions
|
@ -511,7 +511,7 @@ fi
|
|||
|
||||
CMAKE_OPTS="${ninja:+-G Ninja}"
|
||||
BUILD_OPTS="VERBOSE=1"
|
||||
[ -n "${ninja}" ] && BUILD_OPTS="-v"
|
||||
[ -n "${ninja}" ] && BUILD_OPTS="-k 1"
|
||||
|
||||
if [ ${DONOTWAIT} -eq 0 ]; then
|
||||
if [ -n "${NETDATA_PREFIX}" ]; then
|
||||
|
|
|
@ -18,7 +18,7 @@ SCRIPT_SOURCE="$(
|
|||
)"
|
||||
SOURCE_DIR="$(dirname "$(dirname "${SCRIPT_SOURCE}")")"
|
||||
|
||||
CMAKE_ARGS="-S ${SOURCE_DIR} -B ${BUILD_DIR} -G Ninja"
|
||||
CMAKE_ARGS="-S ${SOURCE_DIR} -B ${BUILD_DIR}"
|
||||
|
||||
add_cmake_option() {
|
||||
CMAKE_ARGS="${CMAKE_ARGS} -D${1}=${2}"
|
||||
|
@ -89,8 +89,8 @@ else
|
|||
fi
|
||||
|
||||
# shellcheck disable=SC2086
|
||||
cmake ${CMAKE_ARGS}
|
||||
cmake --build "${BUILD_DIR}" --parallel "$(nproc)"
|
||||
cmake ${CMAKE_ARGS} -G Ninja
|
||||
cmake --build "${BUILD_DIR}" --parallel "$(nproc)" -- -k 1
|
||||
|
||||
if [ "${ENABLE_SENTRY}" = "true" ] && [ "${UPLOAD_SENTRY}" = "true" ]; then
|
||||
sentry-cli debug-files upload -o netdata-inc -p netdata-agent --force-foreground --log-level=debug --wait --include-sources build/netdata
|
||||
|
|
Loading…
Add table
Reference in a new issue