Skip to content

Commit 4dd3be9

Browse files
authored
Merge branch 'develop' into feature/RDKEMW-3529-VRR_support
2 parents cf9599f + 2074036 commit 4dd3be9

File tree

8 files changed

+112
-152
lines changed

8 files changed

+112
-152
lines changed

.github/workflows/Validate_Interface_headers_incremental.yml

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,25 @@ jobs:
2525
git fetch origin ${{ github.event.pull_request.base.ref }} --depth=1
2626
git diff --name-only origin/${{ github.event.pull_request.base.ref }} > changed_files.txt
2727
28+
- name: Filter only existing changed files
29+
id: filter_existing
30+
run: |
31+
touch existing_files.txt
32+
while IFS= read -r file; do
33+
if [ -f "$file" ]; then
34+
echo "$file" >> existing_files.txt
35+
else
36+
echo " $file file has been removed in your PR,hence skipping validation for the removed file"
37+
fi
38+
done < changed_files.txt
39+
2840
- name: Run validation script
2941
run: |
30-
python .github/workflows/validate_interface_headers_incremental.py changed_files.txt
42+
if [ -s existing_files.txt ]; then
43+
python .github/workflows/validate_interface_headers_incremental.py existing_files.txt
44+
else
45+
echo "No valid changed files to validate."
46+
fi
3147
3248
- name: Remove changed_files.txt
3349
run: |

CHANGELOG.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,21 @@ All notable changes to this project will be documented in this file. Dates are d
44

55
Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
66

7+
#### [1.6.0](https://github.com/rdkcentral/entservices-apis/compare/1.5.1...1.6.0)
8+
9+
- IProvisioning.h Interface header not following coding guidelines [`#237`](https://github.com/rdkcentral/entservices-apis/pull/237)
10+
- IProvisioning.h Interface header not following coding guidelines [`#257`](https://github.com/rdkcentral/entservices-apis/pull/257)
11+
- RDKEMW-3385: Implement Caching in New PackageManager [`#248`](https://github.com/rdkcentral/entservices-apis/pull/248)
12+
- IProvisioning.h Interface header not following coding guidelines [`#249`](https://github.com/rdkcentral/entservices-apis/pull/249)
13+
- Merge tag '1.5.1' into develop [`2b988b6`](https://github.com/rdkcentral/entservices-apis/commit/2b988b65d2d7eae1c22538fa2475a1a04eb70143)
14+
715
#### [1.5.1](https://github.com/rdkcentral/entservices-apis/compare/1.5.0...1.5.1)
816

17+
> 6 June 2025
18+
919
- RDK-56578 : Changed deviceType from tv to IpTv [`#156`](https://github.com/rdkcentral/entservices-apis/pull/156)
1020
- RDKEMW-4872: lifecycle2.0 integration [`#242`](https://github.com/rdkcentral/entservices-apis/pull/242)
21+
- 1.5.1 release changelog updates [`b7bbff3`](https://github.com/rdkcentral/entservices-apis/commit/b7bbff3308e54efbb5db7d56c9548e8191bae382)
1122
- Merge tag '1.5.0' into develop [`a7793b3`](https://github.com/rdkcentral/entservices-apis/commit/a7793b312ddb00c8009d34f52031fd6e7f3b5646)
1223

1324
#### [1.5.0](https://github.com/rdkcentral/entservices-apis/compare/1.4.2...1.5.0)

apis/DeviceProvisioning/IProvisioning.h

Lines changed: 0 additions & 43 deletions
This file was deleted.

apis/Ids.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,6 @@ namespace Exchange {
7575
ID_CONTENTDECRYPTION = ID_ENTOS_OFFSET + 0x030,
7676
ID_CONTENTDECRYPTION_NOTIFICATION = ID_CONTENTDECRYPTION + 1,
7777

78-
ID_PROVISIONING = ID_ENTOS_OFFSET + 0x040,
79-
ID_PROVISIONING_NOTIFICATION = ID_PROVISIONING + 1,
80-
8178
ID_CAPTURE = ID_ENTOS_OFFSET + 0x050,
8279

8380
ID_PACKAGER = ID_ENTOS_OFFSET + 0x060,

docs/apis/USBDevicePlugin.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@ No Events
265265

266266
| Name | Type | Description |
267267
| :-------- | :-------- | :-------- |
268-
| result | string | On success null will be returned |
268+
| result | null | On success null will be returned |
269269

270270
### Errors
271271

@@ -294,7 +294,7 @@ No Events
294294
{
295295
"jsonrpc": "2.0",
296296
"id": 42,
297-
"result": "null"
297+
"result": null
298298
}
299299
```
300300

@@ -318,7 +318,7 @@ No Events
318318

319319
| Name | Type | Description |
320320
| :-------- | :-------- | :-------- |
321-
| result | string | On success null will be returned |
321+
| result | null | On success null will be returned |
322322

323323
### Errors
324324

@@ -347,7 +347,7 @@ No Events
347347
{
348348
"jsonrpc": "2.0",
349349
"id": 42,
350-
"result": "null"
350+
"result": null
351351
}
352352
```
353353

0 commit comments

Comments
 (0)