diff --git a/.github/workflows/L1-tests.yml b/.github/workflows/L1-tests.yml old mode 100755 new mode 100644 index e094f0c..aaee2a4 --- a/.github/workflows/L1-tests.yml +++ b/.github/workflows/L1-tests.yml @@ -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}} RDK_SERVICES_L1_TEST: "OFF" @@ -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 @@ -107,7 +109,7 @@ 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' @@ -115,14 +117,14 @@ jobs: 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 - name: Checkout entservices-avinput if: ${{ inputs.caller_source == 'local' }} @@ -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: > @@ -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: > diff --git a/.github/workflows/L2-tests.yml b/.github/workflows/L2-tests.yml old mode 100755 new mode 100644 index 1995de6..dceb9f6 --- a/.github/workflows/L2-tests.yml +++ b/.github/workflows/L2-tests.yml @@ -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}} @@ -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 @@ -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' @@ -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 @@ -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 @@ -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 && @@ -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 @@ -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 @@ -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 @@ -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 diff --git a/build_dependencies.sh b/build_dependencies.sh index 304f157..e397bea 100644 --- a/build_dependencies.sh +++ b/build_dependencies.sh @@ -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} @@ -35,9 +37,15 @@ 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 @@ -45,14 +53,13 @@ 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 - @@ -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 \ diff --git a/plugin/CMakeLists.txt b/plugin/CMakeLists.txt index 52adb50..aaf14a6 100644 --- a/plugin/CMakeLists.txt +++ b/plugin/CMakeLists.txt @@ -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})