Skip to content

Commit d046636

Browse files
hgfell683hgfell683
authored
Merge pull request rdkcentral#62 from rdkcentral/main
Main
2 parents be480c3 + f0d82ec commit d046636

File tree

70 files changed

+6199
-2592
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+6199
-2592
lines changed

‎.github/workflows/L0-PersistentStore.yml‎

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ jobs:
1919
with:
2020
path: ${{github.repository}}
2121

22-
- name: Install valgrind, coverage, cmake
22+
- name: Install valgrind, cmake
2323
run: |
2424
sudo apt update
25-
sudo apt install -y valgrind lcov cmake
25+
sudo apt install -y valgrind cmake
2626
2727
- name: Build Thunder
2828
working-directory: ${{github.workspace}}
@@ -31,25 +31,18 @@ jobs:
3131
- name: Build
3232
working-directory: ${{github.workspace}}
3333
run: |
34-
cmake -S ${GITHUB_REPOSITORY}/PersistentStore/l0test -B build/persistentstorel0test -DCMAKE_INSTALL_PREFIX="install" -DCMAKE_CXX_FLAGS="--coverage -Wall -Werror"
34+
cmake -S ${GITHUB_REPOSITORY}/PersistentStore/l0test -B build/persistentstorel0test -DCMAKE_INSTALL_PREFIX="install" -DCMAKE_CXX_FLAGS="-Wall -Werror"
3535
cmake --build build/persistentstorel0test --target install
3636
3737
- name: Run
3838
working-directory: ${{github.workspace}}
3939
run: PATH=${PWD}/install/bin:${PATH} LD_LIBRARY_PATH=${PWD}/install/lib:${LD_LIBRARY_PATH} valgrind --tool=memcheck --log-file=valgrind_log --leak-check=yes --show-reachable=yes --track-fds=yes --fair-sched=try persistentstorel0test
4040

41-
- name: Generate coverage
42-
working-directory: ${{github.workspace}}
43-
run: |
44-
lcov -c -o coverage.info -d build/persistentstorel0test
45-
genhtml -o coverage coverage.info
46-
4741
- name: Upload artifacts
4842
if: ${{ !env.ACT }}
4943
uses: actions/upload-artifact@v4
5044
with:
5145
name: artifacts
5246
path: |
53-
coverage/
5447
valgrind_log
5548
if-no-files-found: warn

‎.github/workflows/L1-PersistentStore-sqlite.yml‎

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ jobs:
1919
with:
2020
path: ${{github.repository}}
2121

22-
- name: Install valgrind, coverage, cmake, sqlite
22+
- name: Install valgrind, cmake, sqlite
2323
run: |
2424
sudo apt update
25-
sudo apt install -y valgrind lcov cmake libsqlite3-dev
25+
sudo apt install -y valgrind cmake libsqlite3-dev
2626
2727
- name: Build Thunder
2828
working-directory: ${{github.workspace}}
@@ -31,25 +31,18 @@ jobs:
3131
- name: Build
3232
working-directory: ${{github.workspace}}
3333
run: |
34-
cmake -S ${GITHUB_REPOSITORY}/PersistentStore/sqlite/l1test -B build/sqlitel1test -DCMAKE_INSTALL_PREFIX="install" -DCMAKE_CXX_FLAGS="--coverage -Wall -Werror"
34+
cmake -S ${GITHUB_REPOSITORY}/PersistentStore/sqlite/l1test -B build/sqlitel1test -DCMAKE_INSTALL_PREFIX="install" -DCMAKE_CXX_FLAGS="-Wall -Werror"
3535
cmake --build build/sqlitel1test --target install
3636
3737
- name: Run
3838
working-directory: ${{github.workspace}}
3939
run: PATH=${PWD}/install/bin:${PATH} LD_LIBRARY_PATH=${PWD}/install/lib:${LD_LIBRARY_PATH} valgrind --tool=memcheck --log-file=valgrind_log --leak-check=yes --show-reachable=yes --track-fds=yes --fair-sched=try sqlitel1test
4040

41-
- name: Generate coverage
42-
working-directory: ${{github.workspace}}
43-
run: |
44-
lcov -c -o coverage.info -d build/sqlitel1test
45-
genhtml -o coverage coverage.info
46-
4741
- name: Upload artifacts
4842
if: ${{ !env.ACT }}
4943
uses: actions/upload-artifact@v4
5044
with:
5145
name: artifacts
5246
path: |
53-
coverage/
5447
valgrind_log
5548
if-no-files-found: warn

‎.github/workflows/L1-PersistentStore.yml‎

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ jobs:
1919
with:
2020
path: ${{github.repository}}
2121

22-
- name: Install valgrind, coverage, cmake
22+
- name: Install valgrind, cmake
2323
run: |
2424
sudo apt update
25-
sudo apt install -y valgrind lcov cmake
25+
sudo apt install -y valgrind cmake
2626
2727
- name: Build Thunder
2828
working-directory: ${{github.workspace}}
@@ -31,25 +31,18 @@ jobs:
3131
- name: Build
3232
working-directory: ${{github.workspace}}
3333
run: |
34-
cmake -S ${GITHUB_REPOSITORY}/PersistentStore/l1test -B build/persistentstorel1test -DCMAKE_INSTALL_PREFIX="install" -DCMAKE_CXX_FLAGS="--coverage -Wall -Werror"
34+
cmake -S ${GITHUB_REPOSITORY}/PersistentStore/l1test -B build/persistentstorel1test -DCMAKE_INSTALL_PREFIX="install" -DCMAKE_CXX_FLAGS="-Wall -Werror"
3535
cmake --build build/persistentstorel1test --target install
3636
3737
- name: Run
3838
working-directory: ${{github.workspace}}
3939
run: PATH=${PWD}/install/bin:${PATH} LD_LIBRARY_PATH=${PWD}/install/lib:${LD_LIBRARY_PATH} valgrind --tool=memcheck --log-file=valgrind_log --leak-check=yes --show-reachable=yes --track-fds=yes --fair-sched=try persistentstorel1test
4040

41-
- name: Generate coverage
42-
working-directory: ${{github.workspace}}
43-
run: |
44-
lcov -c -o coverage.info -d build/persistentstorel1test
45-
genhtml -o coverage coverage.info
46-
4741
- name: Upload artifacts
4842
if: ${{ !env.ACT }}
4943
uses: actions/upload-artifact@v4
5044
with:
5145
name: artifacts
5246
path: |
53-
coverage/
5447
valgrind_log
5548
if-no-files-found: warn

‎.github/workflows/L1-tests.yml‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -138,11 +138,9 @@ jobs:
138138
ref: ${{env.INTERFACES_REF}}
139139

140140
- name: Apply patches ThunderInterfaces
141-
run: >
142-
cd "${{github.workspace}}/ThunderInterfaces"
143-
&&
144-
git apply "${{github.workspace}}/rdkservices/Tests/L2Tests/patches/DeviceInfo_brand_R2_L1tests.patch"
145-
&&
141+
run: |
142+
cd ThunderInterfaces
143+
patch -p1 < ${{github.workspace}}/rdkservices/Tests/L2Tests/patches/DeviceInfo_brand_R2_L1tests.patch
146144
cd ..
147145
148146
- name: Build ThunderInterfaces
@@ -277,7 +275,7 @@ jobs:
277275
-DPLUGIN_SCREENCAPTURE=ON
278276
-DPLUGIN_USBACCESS=ON
279277
-DPLUGIN_LOGGINGPREFERENCES=ON
280-
-DPLUGIN_USERPREFERENCES=ON
278+
-DPLUGIN_USERPREFERENCES=OFF
281279
-DPLUGIN_MESSENGER=ON
282280
-DPLUGIN_DEVICEINFO=ON
283281
-DPLUGIN_SYSTEMSERVICES=ON

‎.github/workflows/L2-tests-R4-4-1.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ jobs:
7676
run: |
7777
cd ${{github.workspace}}/Thunder
7878
patch -p1 < ${{github.workspace}}/rdkservices/Tests/L2Tests/patches/Use_Legact_Alt_Based_On_ThunderTools_R4.4.3.patch
79+
patch -p1 < ${{github.workspace}}/rdkservices/Tests/L2Tests/patches/error_code_R4_4.patch
7980
cd -
8081
8182
- name: Checkout ThunderTools
@@ -273,6 +274,7 @@ jobs:
273274
-DPLUGIN_USBACCESS=ON
274275
-DPLUGIN_USERSETTINGS=ON
275276
-DPLUGIN_PERSISTENTSTORE=ON
277+
-DPLUGIN_USERPREFERENCES=ON
276278
-DUSE_THUNDER_R4=ON
277279
-DPLUGIN_L2Tests=ON
278280
-DRDK_SERVICE_L2_TEST=ON
@@ -313,6 +315,7 @@ jobs:
313315
/opt/tmtryoptout
314316
/opt/fwdnldstatus.txt
315317
/opt/dcm.properties
318+
/opt/user_preferences.conf
316319
/etc/device.properties
317320
/etc/dcm.properties
318321
/etc/authService.conf

‎.github/workflows/json_validator.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515

1616
- name: Get modified/added json files
1717
id: json-files
18-
uses: tj-actions/changed-files@v19
18+
uses: rdkcentral/tj-actions_changed-files@v19
1919
with:
2020
files: |
2121
**/*.json

‎.github/workflows/update-changelog-and-api-version.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121

2222
- name: Get changed files using defaults
2323
id: changed-files
24-
uses: tj-actions/changed-files@v19
24+
uses: rdkcentral/tj-actions_changed-files@v19
2525

2626
- name: Run step when a CHANGELOG.md didn't change
2727
uses: actions/github-script@v3

‎AVInput/AVInput.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -384,8 +384,8 @@
384384
"typeOfInput":{
385385
"$ref": "#/definitions/typeOfInput"
386386
},
387-
"audioMix":{
388-
"$ref": "#/definitions/audioMix"
387+
"requestAudioMix":{
388+
"$ref": "#/definitions/requestAudioMix"
389389
},
390390
"planeType":{
391391
"$ref": "#/definitions/planeType"

0 commit comments

Comments
 (0)