archive/netdata_netdata
0
0
Fork 0
mirror of https://github.com/netdata/netdata.git synced 2025-04-24 13:14:11 +00:00
Code Issues Projects Releases Wiki Activity

Stop a bit more quickly on a failure when using Ninja. ()

Browse source
This commit is contained in:
Austin S. Hemmelgarn 2024-07-15 06:56:45 -04:00 • committed by GitHub
parent 32b031c555
commit 4ea932e23d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 4 additions and 4 deletions

2
netdata-installer.sh
View file

@ -511,7 +511,7 @@ fi
CMAKE_OPTS="${ninja:+-G Ninja}" CMAKE_OPTS="${ninja:+-G Ninja}"
BUILD_OPTS="VERBOSE=1" BUILD_OPTS="VERBOSE=1"
[ -n "${ninja}" ] && BUILD_OPTS="-v" [ -n "${ninja}" ] && BUILD_OPTS="-k 1"
if [ ${DONOTWAIT} -eq 0 ]; then if [ ${DONOTWAIT} -eq 0 ]; then
if [ -n "${NETDATA_PREFIX}" ]; then if [ -n "${NETDATA_PREFIX}" ]; then

6
packaging/build-package.sh
View file

@ -18,7 +18,7 @@ SCRIPT_SOURCE="$(
)" )"
SOURCE_DIR="$(dirname "$(dirname "${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() { add_cmake_option() {
CMAKE_ARGS="${CMAKE_ARGS} -D${1}=${2}" CMAKE_ARGS="${CMAKE_ARGS} -D${1}=${2}"
@ -89,8 +89,8 @@ else
fi fi
# shellcheck disable=SC2086 # shellcheck disable=SC2086
cmake ${CMAKE_ARGS} cmake ${CMAKE_ARGS} -G Ninja
cmake --build "${BUILD_DIR}" --parallel "$(nproc)" cmake --build "${BUILD_DIR}" --parallel "$(nproc)" -- -k 1
if [ "${ENABLE_SENTRY}" = "true" ] && [ "${UPLOAD_SENTRY}" = "true" ]; then 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 sentry-cli debug-files upload -o netdata-inc -p netdata-agent --force-foreground --log-level=debug --wait --include-sources build/netdata