Skip to content

Commit 49dcea2

Browse files
vjain008vjain008
committed
Merge branch 'release/1.0.7'
2 parents 9824e77 + 0f3be4f commit 49dcea2

19 files changed

+212
-18
lines changed

‎.github/CODEOWNERS‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
# the repo. Unless a later match takes precedence,
33
# @global-owner1 and @global-owner2 will be requested for
44
# review when someone opens a pull request.
5-
* @rdkcentral/nativescript-owners
5+
* @rdkcentral/nativescript-maintainers
66

‎.github/workflows/cla.yml‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
name: "CLA"
2+
3+
permissions:
4+
contents: read
5+
pull-requests: write
6+
actions: write
7+
statuses: write
8+
9+
on:
10+
issue_comment:
11+
types: [created]
12+
pull_request_target:
13+
types: [opened, closed, synchronize]
14+
15+
jobs:
16+
CLA-Lite:
17+
name: "Signature"
18+
uses: rdkcentral/cmf-actions/.github/workflows/cla.yml@v1
19+
secrets:
20+
PERSONAL_ACCESS_TOKEN: ${{ secrets.CLA_ASSISTANT }}

‎.github/workflows/fossid_integration_stateless_diffscan_target_repo.yml‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,18 @@ name: Fossid Stateless Diff Scan
22

33
on:
44
pull_request:
5-
branches:
6-
- develop
5+
types: [opened, synchronize, reopened]
6+
7+
permissions:
8+
contents: read
9+
pull-requests: read
10+
711
jobs:
812
call-fossid-workflow:
9-
uses: rdkcentral/build_tools_workflows/.github/workflows/fossid_integration_stateless_diffscan.yml@develop
13+
if: ${{ ! github.event.pull_request.head.repo.fork }}
14+
uses: rdkcentral/build_tools_workflows/.github/workflows/[email protected]
1015
secrets:
1116
FOSSID_CONTAINER_USERNAME: ${{ secrets.FOSSID_CONTAINER_USERNAME }}
1217
FOSSID_CONTAINER_PASSWORD: ${{ secrets.FOSSID_CONTAINER_PASSWORD }}
1318
FOSSID_HOST_USERNAME: ${{ secrets.FOSSID_HOST_USERNAME }}
1419
FOSSID_HOST_TOKEN: ${{ secrets.FOSSID_HOST_TOKEN }}
15-

‎.github/workflows/jsruntime_L1tests.yml‎

Lines changed: 106 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,106 @@
1+
name: L1 Unit Tests for rdkNativeScript
2+
permissions:
3+
contents: read
4+
checks: write
5+
6+
on:
7+
push:
8+
branches: [develop]
9+
pull_request:
10+
branches: [develop]
11+
workflow_dispatch:
12+
13+
env:
14+
AUTOMATICS_UNAME: ${{ secrets.AUTOMATICS_UNAME }}
15+
AUTOMATICS_PASSCODE: ${{ secrets.AUTOMATICS_PASSCODE }}
16+
17+
jobs:
18+
build-and-test-l1:
19+
runs-on: ubuntu-latest
20+
21+
steps:
22+
- name: Checkout source repository
23+
uses: actions/checkout@v3
24+
25+
- name: Checkout rdkNativeScript_tests repository
26+
uses: actions/checkout@v3
27+
with:
28+
repository: rdk-e/rdkNativeScript_tests
29+
ref: topic/RDKEMW-5610
30+
path: rdkNativeScript_tests
31+
token: ${{ secrets.GH_PAT }}
32+
33+
- name: Install dependencies
34+
run: |
35+
sudo apt-get update && sudo apt-get install -y \
36+
g++ \
37+
cmake \
38+
build-essential \
39+
libcurl4-openssl-dev \
40+
libcjson-dev \
41+
libgtest-dev \
42+
libssl-dev \
43+
zlib1g-dev \
44+
libuv1-dev \
45+
lcov \
46+
libglib2.0-dev
47+
48+
- name: Build Google Test and Google Mock
49+
run: |
50+
cd /usr/src/googletest
51+
sudo cmake -S . -B build
52+
sudo cmake --build build
53+
sudo cp build/lib/libgmock.a /usr/lib
54+
sudo cp build/lib/libgmock_main.a /usr/lib
55+
sudo cp build/lib/libgtest.a /usr/lib
56+
sudo cp build/lib/libgtest_main.a /usr/lib
57+
58+
- name: Configure and Build L1
59+
run: |
60+
mkdir -p build_l1
61+
cd build_l1
62+
cmake -DCMAKE_BUILD_TYPE=Debug \
63+
-DRUN_L1=ON \
64+
-DRUN_L2=OFF \
65+
-DENABLE_JSRUNTIME_ESSOS=ON \
66+
-DENABLE_JSRUNTIME_PLAYER=ON \
67+
-DENABLE_AAMP_JSBINDINGS=ON \
68+
-DENABLE_AAMP_JSBINDINGS_DYNAMIC=ON \
69+
-DENABLE_AAMP_JSBINDINGS_STATIC=OFF \
70+
-DJSRUNTIME_ENGINE_NAME=jsc \
71+
-Djsruntime_source=.. ../rdkNativeScript_tests
72+
make -j$(nproc)
73+
74+
- name: Run L1 Tests and Generate JUnit Results
75+
run: |
76+
cd build_l1
77+
#ctest -R RunL1Tests --output-on-failure --no-compress-output --output-junit ctest-results.xml
78+
./L1_tests --gtest_output=xml:ctest-results.xml
79+
80+
- name: Publish L1 test results
81+
uses: dorny/test-reporter@v1
82+
with:
83+
name: Unit Test Results
84+
path: build_l1/ctest-results.xml
85+
reporter: java-junit
86+
87+
- name: Generate coverage report
88+
run: |
89+
cd build_l1
90+
lcov --capture --directory . --output-file coverage.info --ignore-errors mismatch --rc geninfo_unexecuted_blocks=1
91+
lcov --remove coverage.info '/usr/*' '*/test/*' '*/tests/*' '*/L1/*' '*/mocks/*' '*/gtest/*' '*/gmock/*' '*/googletest/*' '*/include/*' --output-file coverage.cleaned.info --ignore-errors unused
92+
lcov --extract coverage.cleaned.info '*/src/*' --output-file coverage.final.info
93+
genhtml coverage.final.info --output-directory html_coverage_report
94+
95+
- name: Upload test result file (JUnit XML)
96+
uses: actions/upload-artifact@v4
97+
with:
98+
name: ctest-results-l1-${{ github.run_id }}
99+
path: build_l1/ctest-results.xml
100+
101+
- name: Upload coverage report
102+
uses: actions/upload-artifact@v4
103+
with:
104+
name: l1-html-coverage-report
105+
path: build_l1/html_coverage_report
106+
if-no-files-found: warn

‎CHANGELOG.md‎

Lines changed: 20 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,22 @@ 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.0.7](https://github.com/rdkcentral/rdkNativeScript/compare/1.0.6...1.0.7)
8+
9+
- Switching between Xumo Fast Channels and Vipa activated… [`#68`](https://github.com/rdkcentral/rdkNativeScript/pull/68)
10+
- RDKEMW-5610 : L1 test cases for jsruntime [`#66`](https://github.com/rdkcentral/rdkNativeScript/pull/66)
11+
- Deploy fossid_integration_stateless_diffscan_target_repo action [`#67`](https://github.com/rdkcentral/rdkNativeScript/pull/67)
12+
- Deploy cla action [`#40`](https://github.com/rdkcentral/rdkNativeScript/pull/40)
13+
- Update CODEOWNERS [`#63`](https://github.com/rdkcentral/rdkNativeScript/pull/63)
14+
- Switching between Xumo Fast Channels and Vipa activated Channels [`228cf8b`](https://github.com/rdkcentral/rdkNativeScript/commit/228cf8bfdde6d7f7d991805193038b392bc0e89b)
15+
- Merge tag '1.0.6' into develop [`afdf341`](https://github.com/rdkcentral/rdkNativeScript/commit/afdf341c4f81e7019d76f207c7b428dbd0ffc00d)
16+
717
#### [1.0.6](https://github.com/rdkcentral/rdkNativeScript/compare/1.0.5...1.0.6)
818

19+
> 16 September 2025
20+
921
- RDKEMW-8240 : Add logs in jsruntime.log in /opt/logs [`#60`](https://github.com/rdkcentral/rdkNativeScript/pull/60)
22+
- 1.0.6 release changelog updates [`1721c05`](https://github.com/rdkcentral/rdkNativeScript/commit/1721c05e9b79e6be0e98852b6f596abf7b6f1e68)
1023
- Merge tag '1.0.5' into develop [`0bae809`](https://github.com/rdkcentral/rdkNativeScript/commit/0bae809fc9bb8a69156798e07b15cade4c526431)
1124

1225
#### [1.0.5](https://github.com/rdkcentral/rdkNativeScript/compare/1.0.4...1.0.5)
@@ -22,7 +35,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
2235
> 7 September 2025
2336
2437
- RDKEMW-7489: Adding Href support [`#54`](https://github.com/rdkcentral/rdkNativeScript/pull/54)
25-
- Ticket:RDKEMW-5556: Bug for terminateApplication [`#51`](https://github.com/rdkcentral/rdkNativeScript/pull/51)
38+
- RDKEMW-5556: Bug for terminateApplication [`#51`](https://github.com/rdkcentral/rdkNativeScript/pull/51)
2639
- 1.0.4 release changelog updates [`2e56742`](https://github.com/rdkcentral/rdkNativeScript/commit/2e56742d0adda04fe61277fa0782e2b5b2dde19c)
2740
- Merge tag '1.0.3' into develop [`e15828d`](https://github.com/rdkcentral/rdkNativeScript/commit/e15828d5a330b072753e682f5c446b0f9ae14531)
2841

@@ -45,9 +58,9 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
4558
- RDKEMW-4729:Add support for clearMeasures [`#33`](https://github.com/rdkcentral/rdkNativeScript/pull/33)
4659
- RDKEMW-3466 : JSRuntimeWidget [`#32`](https://github.com/rdkcentral/rdkNativeScript/pull/32)
4760
- RDKEMW-4353:Implement logs to remain [`#29`](https://github.com/rdkcentral/rdkNativeScript/pull/29)
48-
- Ticket Number:RDKEMW-4353:Bug when set DEBUG level [`#28`](https://github.com/rdkcentral/rdkNativeScript/pull/28)
49-
- Ticket Number:RDKEMW-4278:Update launchTime metrics [`#27`](https://github.com/rdkcentral/rdkNativeScript/pull/27)
50-
- Ticket Number:RDKEMW-4353:Implement logs to remain [`32f6cf1`](https://github.com/rdkcentral/rdkNativeScript/commit/32f6cf11af9c786d34334838ff75065fbd0d70cf)
61+
- RDKEMW-4353:Bug when set DEBUG level [`#28`](https://github.com/rdkcentral/rdkNativeScript/pull/28)
62+
- RDKEMW-4278:Update launchTime metrics [`#27`](https://github.com/rdkcentral/rdkNativeScript/pull/27)
63+
- RDKEMW-4353:Implement logs to remain [`32f6cf1`](https://github.com/rdkcentral/rdkNativeScript/commit/32f6cf11af9c786d34334838ff75065fbd0d70cf)
5164
- 1.0.2 release changelog updates [`bd89254`](https://github.com/rdkcentral/rdkNativeScript/commit/bd89254c510cbd92accda18c4df5fa8d7221615f)
5265
- RDKEMW-4729: Code cleanup for window change [`9162e1c`](https://github.com/rdkcentral/rdkNativeScript/commit/9162e1cc2b8c7a19c41a7420e19f05786df4899e)
5366

@@ -57,12 +70,12 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
5770
5871
- RDKEMW-3457 : WebSocket IPC [`#24`](https://github.com/rdkcentral/rdkNativeScript/pull/24)
5972
- RDKEMW-3523:Update rdkNativeScript with application identifiers [`#20`](https://github.com/rdkcentral/rdkNativeScript/pull/20)
60-
- Ticket Number:RDKEMW-3430: Implementing log levels [`#22`](https://github.com/rdkcentral/rdkNativeScript/pull/22)
73+
- RDKEMW-3430: Implementing log levels [`#22`](https://github.com/rdkcentral/rdkNativeScript/pull/22)
6174
- RDKEMW-3105 : Add ability to show network connections with details [`#18`](https://github.com/rdkcentral/rdkNativeScript/pull/18)
62-
- Ticket Number :RDKEMW-3557:-Metrics for launchtime [`#19`](https://github.com/rdkcentral/rdkNativeScript/pull/19)
75+
- RDKEMW-3557:-Metrics for launchtime [`#19`](https://github.com/rdkcentral/rdkNativeScript/pull/19)
6376
- RDKEMW-2175 : Run player within jsruntime plugin via dynamic load of … [`#16`](https://github.com/rdkcentral/rdkNativeScript/pull/16)
6477
- 3523:Update rdkNativeScript with interface API's [`60fc51b`](https://github.com/rdkcentral/rdkNativeScript/commit/60fc51b6f48272e9671bc787c68a2ce19b036e0c)
65-
- Ticket Number:RDKEMW-3557:Metrics for launch time [`eca1c15`](https://github.com/rdkcentral/rdkNativeScript/commit/eca1c15b2e98e40156dba22696325c2c5d5fbaa5)
78+
- RDKEMW-3557:Metrics for launch time [`eca1c15`](https://github.com/rdkcentral/rdkNativeScript/commit/eca1c15b2e98e40156dba22696325c2c5d5fbaa5)
6679
- 1.0.1 release changelog updates [`e60bbb2`](https://github.com/rdkcentral/rdkNativeScript/commit/e60bbb2b72c74a43c34af35179d4b619fd9ac779)
6780

6881
#### 1.0.0

‎include/EssosInstance.h‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,12 @@
2020
#ifndef NativeJS_ESSOS_INSTANCE_H
2121
#define NativeJS_ESSOS_INSTANCE_H
2222

23+
#ifdef USE_ESSOS_MOCK
24+
#include "essos_mock.h"
25+
#else
2326
#include <essos.h>
27+
#endif
28+
2429
#include <KeyListener.h>
2530

2631
class EssosInstance

‎include/JSRuntimeClient.h‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,14 @@
1818
**/
1919

2020
#pragma once
21+
22+
#ifdef USE_WEBSOCKET_MOCK
23+
#include "websocketpp.hpp"
24+
#else
2125
#include <websocketpp/config/asio_no_tls_client.hpp>
2226
#include <websocketpp/common/thread.hpp>
2327
#include <websocketpp/client.hpp>
28+
#endif
2429

2530
#include <string>
2631
#include <condition_variable>

‎include/JSRuntimeServer.h‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,13 @@
1919

2020
#pragma once
2121
#include <NativeJSRenderer.h>
22+
23+
#ifdef USE_WEBSOCKET_MOCK
24+
#include "websocketpp.hpp"
25+
#else
2226
#include <websocketpp/config/asio_no_tls.hpp>
2327
#include <websocketpp/server.hpp>
28+
#endif
2429

2530
#include <memory>
2631
#include <mutex>

‎include/jsc/JavaScriptContext.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@ class JavaScriptContext: public JavaScriptContextBase, public NetworkMetricsList
100100
#ifdef ENABLE_AAMP_JSBINDINGS_DYNAMIC
101101
void loadAAMPJSBindingsLib();
102102
void unloadAAMPJSBindingsLib();
103+
void *jscLibHandle = nullptr;
103104
#endif
104105
#endif
105106
JSContextGroupRef mContextGroup;

‎include/jsc/JavaScriptEngine.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222

2323
#include <unistd.h>
2424
#include <errno.h>
25+
#include <cstdint>
2526

2627
//#include <algorithm>
2728
#include <string>

0 commit comments

Comments
 (0)