Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 8 additions & 23 deletions .github/workflows/L1-tests.yml
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,10 @@ on:
env:
BUILD_TYPE: Debug
REPO_NAME: "avinput"
THUNDER_REF: "R4.4.1"
INTERFACES_REF: "4.0.8"
THUNDER_TOOLS_COMMIT_SHA: "d5dd83c7c19c49c7f25c558c126500bd2d64f7a4"
THUNDER_COMMIT_SHA: "2c0fcc5529e7da734be558ca6efa05d934dcce31"
THUNDER_REF: "R4.4.6"
INTERFACES_REF: "develop"
AUTOMATICS_UNAME: ${{ secrets.AUTOMATICS_UNAME}}
AUTOMATICS_PASSCODE: ${{ secrets. AUTOMATICS_PASSCODE}}
Comment thread
RajaLucy marked this conversation as resolved.
RDK_SERVICES_L1_TEST: "OFF"
Expand Down Expand Up @@ -63,7 +65,7 @@ jobs:
!install/usr/lib/pkgconfig/gtest.pc
!install/usr/lib/pkgconfig/gtest_main.pc
!install/usr/lib/wpeframework/plugins
key: ${{ runner.os }}-${{ env.REPO_NAME }}-${{ env.THUNDER_REF }}-${{ env.INTERFACES_REF }}-4
key: ${{ runner.os }}-${{ env.REPO_NAME }}-${{ env.THUNDER_COMMIT_SHA }}-${{ env.INTERFACES_REF }}-4

- name: Set up Python
uses: actions/setup-python@v4
Expand Down Expand Up @@ -107,22 +109,22 @@ jobs:
with:
repository: rdkcentral/Thunder
path: Thunder
ref: ${{env.THUNDER_REF}}
ref: ${{env.THUNDER_COMMIT_SHA}}

- name: Checkout ThunderTools
if: steps.cache.outputs.cache-hit != 'true'
uses: actions/checkout@v3
with:
repository: rdkcentral/ThunderTools
path: ThunderTools
ref: R4.4.3
ref: ${{env.THUNDER_TOOLS_COMMIT_SHA}}

- name: Checkout entservices-testframework
uses: actions/checkout@v3
with:
repository: rdkcentral/entservices-testframework
path: entservices-testframework
ref: 1.0.14
ref: develop

Comment thread
RajaLucy marked this conversation as resolved.
- name: Checkout entservices-avinput
if: ${{ inputs.caller_source == 'local' }}
Expand All @@ -145,13 +147,6 @@ jobs:
path: googletest
ref: v1.15.0

- name: Apply patches ThunderTools
if: steps.cache.outputs.cache-hit != 'true'
run: |
cd $GITHUB_WORKSPACE/ThunderTools
patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/00010-R4.4-Add-support-for-project-dir.patch
cd -

- name: Build ThunderTools
if: steps.cache.outputs.cache-hit != 'true'
run: >
Expand All @@ -167,16 +162,6 @@ jobs:
&&
cmake --install build/ThunderTools

- name: Apply patches Thunder
if: steps.cache.outputs.cache-hit != 'true'
run: |
cd $GITHUB_WORKSPACE/Thunder
patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/Use_Legact_Alt_Based_On_ThunderTools_R4.4.3.patch
patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/error_code_R4_4.patch
patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/1004-Add-support-for-project-dir.patch
patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/RDKEMW-733-Add-ENTOS-IDS.patch
cd -

- name: Build Thunder
if: steps.cache.outputs.cache-hit != 'true'
run: >
Expand Down
32 changes: 8 additions & 24 deletions .github/workflows/L2-tests.yml
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,10 @@ on:

env:
BUILD_TYPE: Debug
THUNDER_REF: "R4.4.1"
INTERFACES_REF: "4.0.8"
THUNDER_TOOLS_COMMIT_SHA: "d5dd83c7c19c49c7f25c558c126500bd2d64f7a4"
THUNDER_COMMIT_SHA: "2c0fcc5529e7da734be558ca6efa05d934dcce31"
THUNDER_REF: "R4.4.6"
INTERFACES_REF: "develop"
AUTOMATICS_UNAME: ${{ secrets.AUTOMATICS_UNAME}}
AUTOMATICS_PASSCODE: ${{ secrets. AUTOMATICS_PASSCODE}}
Comment thread
RajaLucy marked this conversation as resolved.

Expand Down Expand Up @@ -76,14 +78,14 @@ jobs:
with:
repository: rdkcentral/Thunder
path: Thunder
ref: ${{env.THUNDER_REF}}
ref: ${{env.THUNDER_COMMIT_SHA}}

- name: Checkout ThunderTools
uses: actions/checkout@v3
with:
repository: rdkcentral/ThunderTools
path: ThunderTools
ref: R4.4.3
ref: ${{env.THUNDER_TOOLS_COMMIT_SHA}}

- name: Checkout entservices-deviceanddisplay
uses: actions/checkout@v3
Expand Down Expand Up @@ -111,7 +113,7 @@ jobs:
with:
repository: rdkcentral/entservices-testframework
path: entservices-testframework
ref: 1.0.14
ref: develop

- name: Checkout googletest
if: steps.cache.outputs.cache-hit != 'true'
Expand All @@ -121,12 +123,6 @@ jobs:
path: googletest
ref: v1.15.0

- name: Apply patches ThunderTools
run: |
cd $GITHUB_WORKSPACE/ThunderTools
patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/00010-R4.4-Add-support-for-project-dir.patch
cd -

- name: Build ThunderTools
run: >
cmake
Expand All @@ -141,15 +137,6 @@ jobs:
&&
cmake --install build/ThunderTools

- name: Apply patches Thunder
run: |
cd $GITHUB_WORKSPACE/Thunder
patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/Use_Legact_Alt_Based_On_ThunderTools_R4.4.3.patch
patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/error_code_R4_4.patch
patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/1004-Add-support-for-project-dir.patch
patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/RDKEMW-733-Add-ENTOS-IDS.patch
patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/Increase_Timout_For_L2Tests_Plugin.patch
cd -
- name: Build Thunder
run: >
cmake
Expand All @@ -163,6 +150,7 @@ jobs:
-DBINDING=127.0.0.1
-DPORT=9998
-DEXCEPTIONS_ENABLE=ON
-DCONFIG_PATH="$GITHUB_WORKSPACE/install/etc/WPEFramework/plugins"
&&
cmake --build build/Thunder -j8
&&
Expand Down Expand Up @@ -318,7 +306,6 @@ jobs:
-fprofile-arcs
-ftest-coverage
-DEXCEPTIONS_ENABLE=ON
-DUSE_THUNDER_R4=ON
-DTHUNDER_VERSION=4
-DTHUNDER_VERSION_MAJOR=4
-DTHUNDER_VERSION_MINOR=4
Expand Down Expand Up @@ -407,7 +394,6 @@ jobs:
-DEXCEPTIONS_ENABLE=ON
-fprofile-arcs
-ftest-coverage
-DUSE_THUNDER_R4=ON
-DTHUNDER_VERSION=4
-DTHUNDER_VERSION_MAJOR=4
-DTHUNDER_VERSION_MINOR=4
Expand Down Expand Up @@ -486,7 +472,6 @@ jobs:
-DEXCEPTIONS_ENABLE=ON
-fprofile-arcs
-ftest-coverage
-DUSE_THUNDER_R4=ON
-DTHUNDER_VERSION=4
-DTHUNDER_VERSION_MAJOR=4
-DTHUNDER_VERSION_MINOR=4
Expand Down Expand Up @@ -566,7 +551,6 @@ jobs:
-DEXCEPTIONS_ENABLE=ON
-fprofile-arcs
-ftest-coverage
-DUSE_THUNDER_R4=ON
-DTHUNDER_VERSION=4
-DTHUNDER_VERSION_MAJOR=4
-DTHUNDER_VERSION_MINOR=4
Expand Down
19 changes: 11 additions & 8 deletions build_dependencies.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@
set -x
set -e
##############################
THUNDER_TOOLS_COMMIT_SHA="d5dd83c7c19c49c7f25c558c126500bd2d64f7a4"
THUNDER_COMMIT_SHA="2c0fcc5529e7da734be558ca6efa05d934dcce31"
GITHUB_WORKSPACE="${PWD}"
ls -la ${GITHUB_WORKSPACE}
cd ${GITHUB_WORKSPACE}
Expand All @@ -35,24 +37,29 @@ pip install jsonref
# Clone the required repositories


git clone --branch R4.4.3 https://github.com/rdkcentral/ThunderTools.git
git clone -b R4_4-RDK https://github.com/rdkcentral/ThunderTools.git
cd ThunderTools
git checkout $THUNDER_TOOLS_COMMIT_SHA
cd ..

git clone --branch R4.4.1 https://github.com/rdkcentral/Thunder.git
git clone -b R4_4-RDK https://github.com/rdkcentral/Thunder.git
cd Thunder
git checkout $THUNDER_COMMIT_SHA
cd ..

git clone --branch 4.0.8 https://github.com/rdkcentral/entservices-apis.git

cd ..
git clone --branch develop https://github.com/rdkcentral/entservices-helpers.git
cd "$GITHUB_WORKSPACE"

git clone --branch 1.0.14 https://github.com/rdkcentral/entservices-testframework.git
git clone --branch develop https://github.com/rdkcentral/entservices-testframework.git

############################
# Build Thunder-Tools
echo "======================================================================================"
echo "buliding thunderTools"
cd ThunderTools
patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/00010-R4.4-Add-support-for-project-dir.patch
cd -


Expand All @@ -71,10 +78,6 @@ echo "==========================================================================
echo "buliding thunder"

cd Thunder
patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/Use_Legact_Alt_Based_On_ThunderTools_R4.4.3.patch
patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/error_code_R4_4.patch
patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/1004-Add-support-for-project-dir.patch
patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/RDKEMW-733-Add-ENTOS-IDS.patch
cd -

cmake -G Ninja -S Thunder -B build/Thunder \
Expand Down
2 changes: 1 addition & 1 deletion plugin/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -87,4 +87,4 @@ target_link_libraries(${MODULE_NAME} PUBLIC ${NAMESPACE}Plugins::${NAMESPACE}Plu
install(TARGETS ${PLUGIN_IMPLEMENTATION} DESTINATION lib/${STORAGE_DIRECTORY}/plugins)
install(TARGETS ${MODULE_NAME} DESTINATION lib/${STORAGE_DIRECTORY}/plugins)

write_config(${PLUGIN_NAME})
write_config(PLUGINS ${PLUGIN_NAME})
Loading