From 4e13cb8f0c6405782ada90372e8810fdf0cdc5a5 Mon Sep 17 00:00:00 2001 From: Rangaiah Date: Mon, 19 Aug 2024 11:27:00 +0530 Subject: [PATCH 1/2] Added rtrouted in workflow --- .github/workflows/push.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index bc9d74e0..fd34c990 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -44,7 +44,7 @@ jobs: - name: CMake working-directory: build run: | - cmake .. -DINTEGRATION_TESTING:BOOL=false -DDISABLE_VALGRIND:BOOL=${DISABLE_VALGRIND} -DENABLE_SESHAT:BOOL=true -DFEATURE_DNS_QUERY:BOOL=true + cmake .. -DENABLE_WEBCFGBIN:BOOL=true -DINTEGRATION_TESTING:BOOL=false -DDISABLE_VALGRIND:BOOL=${DISABLE_VALGRIND} -DENABLE_SESHAT:BOOL=true -DFEATURE_DNS_QUERY:BOOL=true - name: Build @@ -64,7 +64,8 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Upload Codecov.io - uses: codecov/codecov-action@eaaf4bedf32dbdc6b720b63067d99c4d77d6047d # v3.1.4 + #uses: codecov/codecov-action@eaaf4bedf32dbdc6b720b63067d99c4d77d6047d # v3.1.4 + uses: codecov/codecov-action@e28ff129e5465c2c0dcc6f003fc735cb6ae0c673 # v4.5.0 with: directory: . flags: unittests From 4a33920b8e99778f577a1cca7025ed698c16ba1a Mon Sep 17 00:00:00 2001 From: Rangaiah Date: Mon, 19 Aug 2024 11:27:00 +0530 Subject: [PATCH 2/2] Added rtrouted in workflow --- .github/scripts/rtrouted.sh | 16 ++++++++++++++++ .github/workflows/push.yml | 23 ++++++++++++++++++++--- 2 files changed, 36 insertions(+), 3 deletions(-) create mode 100755 .github/scripts/rtrouted.sh diff --git a/.github/scripts/rtrouted.sh b/.github/scripts/rtrouted.sh new file mode 100755 index 00000000..7c35d464 --- /dev/null +++ b/.github/scripts/rtrouted.sh @@ -0,0 +1,16 @@ +#!/bin/bash +export RBUS_ROOT=${HOME}/rbus +export RBUS_INSTALL_DIR=${RBUS_ROOT}/install +export RBUS_BRANCH=main +mkdir -p $RBUS_INSTALL_DIR +cd $RBUS_ROOT +git clone https://github.com/rdkcentral/rbus +cmake -Hrbus -Bbuild/rbus -DCMAKE_INSTALL_PREFIX=${RBUS_INSTALL_DIR}/usr -DBUILD_FOR_DESKTOP=ON -DCMAKE_BUILD_TYPE=Debug +make -C build/rbus && make -C build/rbus install +export PATH=${RBUS_INSTALL_DIR}/usr/bin:${PATH} && \ +export LD_LIBRARY_PATH=${RBUS_INSTALL_DIR}/usr/lib:${LD_LIBRARY_PATH} +nohup rtrouted -f -l DEBUG > /tmp/rtrouted_log.txt & +mkdir ${RBUS_INSTALL_DIR}/usr/lib/rbus_temp_lib +cp ${RBUS_INSTALL_DIR}/usr/lib/librbuscore.so* ${RBUS_INSTALL_DIR}/usr/lib/rbus_temp_lib/ +cp ${RBUS_INSTALL_DIR}/usr/lib/librtMessage.so* ${RBUS_INSTALL_DIR}/usr/lib/rbus_temp_lib/ +cp ${RBUS_INSTALL_DIR}/usr/lib/libcjson.so ${RBUS_INSTALL_DIR}/usr/lib/rbus_temp_lib/ diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index bc9d74e0..89fba97a 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -44,14 +44,30 @@ jobs: - name: CMake working-directory: build run: | - cmake .. -DINTEGRATION_TESTING:BOOL=false -DDISABLE_VALGRIND:BOOL=${DISABLE_VALGRIND} -DENABLE_SESHAT:BOOL=true -DFEATURE_DNS_QUERY:BOOL=true - + cmake .. -DENABLE_WEBCFGBIN:BOOL=true -DINTEGRATION_TESTING:BOOL=false -DDISABLE_VALGRIND:BOOL=${DISABLE_VALGRIND} -DENABLE_SESHAT:BOOL=true -DFEATURE_DNS_QUERY:BOOL=true + + - name: Get rtrouted Binary + working-directory: build + run: | + ../.github/scripts/rtrouted.sh - name: Build working-directory: build run: | + ps aux + export RBUS_ROOT=${HOME}/rbus + export RBUS_INSTALL_DIR=${RBUS_ROOT}/install && \ + export LD_LIBRARY_PATH=${RBUS_INSTALL_DIR}/usr/lib/rbus_temp_lib:${LD_LIBRARY_PATH} + export C_INCLUDE_PATH=${RBUS_INSTALL_DIR}/usr/include + mkdir _install + mkdir _install/lib + cp ${RBUS_INSTALL_DIR}/usr/lib/librbus* _install/lib build-wrapper-linux-x86-64 --out-dir bw-output make all test + - name: Stop rtrouted + run: | + killall -9 rtrouted + - name: Merge GCOV Reports for Sonarcloud working-directory: build run: | @@ -64,7 +80,8 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Upload Codecov.io - uses: codecov/codecov-action@eaaf4bedf32dbdc6b720b63067d99c4d77d6047d # v3.1.4 + #uses: codecov/codecov-action@eaaf4bedf32dbdc6b720b63067d99c4d77d6047d # v3.1.4 + uses: codecov/codecov-action@e28ff129e5465c2c0dcc6f003fc735cb6ae0c673 # v4.5.0 with: directory: . flags: unittests