From b111369e562862f0fff7754ba8676a4b86243fbf Mon Sep 17 00:00:00 2001 From: khromenokroman Date: Wed, 4 Sep 2024 22:36:02 +0200 Subject: [PATCH] iox-#2330 Edit ci iox-#2330 Edit ci iox-#2330 Edit ci iox-#2330 Edit ci iox-#2330 Edit ci --- tools/ci/build-test-ubuntu-support-systemd-integrations.sh | 5 ++++- tools/ci/build-test-ubuntu.sh | 1 + tools/iceoryx_build_test.sh | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/tools/ci/build-test-ubuntu-support-systemd-integrations.sh b/tools/ci/build-test-ubuntu-support-systemd-integrations.sh index 1d57a03043..ffb0847e45 100755 --- a/tools/ci/build-test-ubuntu-support-systemd-integrations.sh +++ b/tools/ci/build-test-ubuntu-support-systemd-integrations.sh @@ -28,8 +28,11 @@ msg() { printf "\033[1;32m%s: %s\033[0m\n" ${FUNCNAME[1]} "$1" } +WORKSPACE=$(git rev-parse --show-toplevel) +DIR_BUILD="build" + msg "Create unit file" -echo -e "[Unit]\nDescription=Test application roudi\n\n[Service]\nType=notify\nRestartSec=10\nRestart=always\nExecStart=/usr/local/bin/iox-roudi\nTimeoutStartSec=10\nWatchdogSec=5\n\n[Install]\nWantedBy=multi-user.target" | tee /usr/lib/systemd/system/test_iox.service > /dev/null +echo -e "[Unit]\nDescription=Test application roudi\n\n[Service]\nType=notify\nRestartSec=10\nRestart=always\nExecStart=${WORKSPACE}/${DIR_BUILD}/iox-roudi\nTimeoutStartSec=10\nWatchdogSec=5\n\n[Install]\nWantedBy=multi-user.target" | tee /usr/lib/systemd/system/test_iox.service > /dev/null msg "Show unit" cat /usr/lib/systemd/system/test_iox.service diff --git a/tools/ci/build-test-ubuntu.sh b/tools/ci/build-test-ubuntu.sh index 20a4ffd595..843539cce7 100755 --- a/tools/ci/build-test-ubuntu.sh +++ b/tools/ci/build-test-ubuntu.sh @@ -48,6 +48,7 @@ $(clang --version)" msg "building sources" ./tools/iceoryx_build_test.sh build-strict build-all out-of-tree build-shared test-add-user ${BUILD_32BIT} +cd ./build msg "building debian package" ./tools/iceoryx_build_test.sh package ${BUILD_32BIT} diff --git a/tools/iceoryx_build_test.sh b/tools/iceoryx_build_test.sh index 823868c670..1fe563f6bb 100755 --- a/tools/iceoryx_build_test.sh +++ b/tools/iceoryx_build_test.sh @@ -58,7 +58,7 @@ COMPONENTS="iceoryx_platform iceoryx_hoofs iceoryx_posh iceoryx_introspection ic TOOLCHAIN_FILE="" CMAKE_C_FLAGS="" CMAKE_CXX_FLAGS="" -USE_SYSTEMD_FLAGS="" +USE_SYSTEMD_FLAGS="OFF" while (( "$#" )); do case "$1" in