Skip to content

Commit 3aa1ec6

Browse files
authored
Merge branch 'develop' into feature/RDKEMW-8349_ctrlm_release_v1.1.4
2 parents f924c45 + 7f1a6ff commit 3aa1ec6

File tree

4 files changed

+130
-10
lines changed

4 files changed

+130
-10
lines changed
Lines changed: 113 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,113 @@
1+
name: PR Description Validation
2+
3+
on:
4+
pull_request:
5+
branches: [develop]
6+
types: [opened, edited, synchronize]
7+
8+
jobs:
9+
validate-pr-description:
10+
runs-on: ubuntu-latest
11+
steps:
12+
- name: Checkout code
13+
uses: actions/checkout@v4
14+
15+
- name: Validate PR Description
16+
env:
17+
PR_TITLE: ${{ github.event.pull_request.title }}
18+
PR_BODY: ${{ github.event.pull_request.body }}
19+
run: |
20+
# Define valid ticket IDs
21+
VALID_TICKET_IDS=("RDKEMW" "RDKEVD" "IMMUI" "RDK")
22+
23+
# Function to validate ticket format and ID
24+
validate_ticket() {
25+
local text="$1"
26+
local field_name="$2"
27+
28+
echo "Validating $field_name: $text"
29+
30+
# Check if text matches the pattern <TICKETID>-<ticketno.> : <desc>
31+
if [[ ! "$text" =~ ^[A-Z0-9]+-[0-9]+[[:space:]]*:[[:space:]]*.+ ]]; then
32+
echo "ERROR: $field_name format is invalid."
33+
echo "Expected format: <TICKETID>-<ticketno.> : <description>"
34+
echo "Example: RDKEMW-123 : Fix playbook issue"
35+
echo ""
36+
echo "Valid ticket IDs are:"
37+
printf "%s\n" "${VALID_TICKET_IDS[@]}"
38+
return 1
39+
fi
40+
41+
# Extract ticket ID from the text
42+
local ticket_prefix=$(echo "$text" | sed -n 's/^\([A-Z0-9]\+\)-[0-9]\+[[:space:]]*:.*$/\1/p')
43+
44+
if [ -z "$ticket_prefix" ]; then
45+
echo "ERROR: Could not extract ticket ID from $field_name."
46+
echo "Expected format: <TICKETID>-<ticketno.> : <description>"
47+
echo ""
48+
echo "Valid ticket IDs are:"
49+
printf "%s\n" "${VALID_TICKET_IDS[@]}"
50+
return 1
51+
fi
52+
53+
# Check if extracted ticket ID is in the valid list
54+
local valid=false
55+
for valid_id in "${VALID_TICKET_IDS[@]}"; do
56+
if [ "$ticket_prefix" = "$valid_id" ]; then
57+
valid=true
58+
break
59+
fi
60+
done
61+
62+
if [ "$valid" = false ]; then
63+
echo "ERROR: Invalid ticket ID '$ticket_prefix' in $field_name"
64+
echo ""
65+
echo "Valid ticket IDs are:"
66+
printf "%s\n" "${VALID_TICKET_IDS[@]}"
67+
echo ""
68+
echo "Your $field_name should start with one of the above ticket IDs followed by a number."
69+
echo "Example: RDKEMW-123 : Fix playbook issue"
70+
return 1
71+
fi
72+
73+
echo "$field_name validation passed! Ticket ID: $ticket_prefix"
74+
return 0
75+
}
76+
77+
# Track validation results
78+
TITLE_VALID=true
79+
DESCRIPTION_VALID=true
80+
81+
# Validate PR Title
82+
echo "=== Validating PR Title ==="
83+
if ! validate_ticket "$PR_TITLE" "PR title"; then
84+
TITLE_VALID=false
85+
fi
86+
87+
echo ""
88+
echo "=== Validating PR Description ==="
89+
# Validate PR Description
90+
if [ -n "$PR_BODY" ]; then
91+
if ! validate_ticket "$PR_BODY" "PR description"; then
92+
DESCRIPTION_VALID=false
93+
fi
94+
else
95+
echo "ERROR: PR description is empty."
96+
echo "Both PR title and description must contain valid ticket IDs."
97+
DESCRIPTION_VALID=false
98+
fi
99+
100+
echo ""
101+
echo "=== Validation Summary ==="
102+
echo "PR Title: $([ "$TITLE_VALID" = true ] && echo "PASSED" || echo " FAILED")"
103+
echo "PR Description: $([ "$DESCRIPTION_VALID" = true ] && echo "PASSED" || echo "FAILED")"
104+
105+
# Exit with error if either validation failed
106+
if [ "$TITLE_VALID" = false ] || [ "$DESCRIPTION_VALID" = false ]; then
107+
echo ""
108+
echo "VALIDATION FAILED: Both PR title and description must contain valid ticket IDs from the approved list: ${VALID_TICKET_IDS[@]}"
109+
exit 1
110+
fi
111+
112+
echo ""
113+
echo "ALL VALIDATIONS PASSED! Both PR title and description contain valid ticket IDs."

conf/include/generic-pkgrev.inc

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ PV:pn-rbus = "2.9.0"
3838
PR:pn-rbus = "r0"
3939
PACKAGE_ARCH:pn-rbus = "${MIDDLEWARE_ARCH}"
4040

41-
PV:pn-rfc = "1.1.6"
41+
PV:pn-rfc = "1.1.7"
4242
PR:pn-rfc = "r0"
4343
PACKAGE_ARCH:pn-rfc = "${MIDDLEWARE_ARCH}"
4444

@@ -144,7 +144,7 @@ PV:pn-entservices-deviceanddisplay = "3.2.9"
144144
PR:pn-entservices-deviceanddisplay = "r0"
145145
PACKAGE_ARCH:pn-entservices-deviceanddisplay = "${MIDDLEWARE_ARCH}"
146146

147-
PV:pn-entservices-infra = "2.1.0"
147+
PV:pn-entservices-infra = "3.0.0"
148148
PR:pn-entservices-infra = "r0"
149149
PACKAGE_ARCH:pn-entservices-infra = "${MIDDLEWARE_ARCH}"
150150

@@ -156,7 +156,7 @@ PV:pn-entservices-mediaanddrm = "1.3.6"
156156
PR:pn-entservices-mediaanddrm = "r0"
157157
PACKAGE_ARCH:pn-entservices-mediaanddrm = "${MIDDLEWARE_ARCH}"
158158

159-
PV:pn-entservices-peripherals = "1.0.16"
159+
PV:pn-entservices-peripherals = "1.0.17"
160160
PR:pn-entservices-peripherals = "r0"
161161
PACKAGE_ARCH:pn-entservices-peripherals = "${MIDDLEWARE_ARCH}"
162162

@@ -241,7 +241,7 @@ PACKAGE_ARCH:pn-libflac = "${MIDDLEWARE_ARCH}"
241241

242242
PACKAGE_ARCH:pn-wpeframework = "${MIDDLEWARE_ARCH}"
243243

244-
PV:pn-entservices-apis = "1.17.0"
244+
PV:pn-entservices-apis = "2.0.0"
245245
PR:pn-entservices-apis = "r0"
246246
PACKAGE_ARCH:pn-entservices-apis = "${MIDDLEWARE_ARCH}"
247247

@@ -270,7 +270,7 @@ PV:pn-xdial = "1.0.0"
270270
PR:pn-xdial = "r0"
271271
PACKAGE_ARCH:pn-xdial = "${MIDDLEWARE_ARCH}"
272272

273-
PV:pn-sysint = "3.0.6"
273+
PV:pn-sysint = "3.0.7"
274274
PR:pn-sysint = "r0"
275275
PACKAGE_ARCH:pn-sysint = "${MIDDLEWARE_ARCH}"
276276

@@ -437,8 +437,13 @@ PACKAGE_ARCH:pn-packager-lisa = "${MIDDLEWARE_ARCH}"
437437

438438
PACKAGE_ARCH:pn-gdb = "${MIDDLEWARE_ARCH}"
439439

440+
PV:pn-sceneset = "1.0.0"
441+
PR:pn-sceneset = "r0"
442+
PACKAGE_ARCH:pn-sceneset = "${MIDDLEWARE_ARCH}"
443+
440444
PV:pn-packager-headers = "1.0.0"
441445
PR:pn-packager-headers = "r0"
442446
PACKAGE_ARCH:pn-packager-headers = "${MIDDLEWARE_ARCH}"
447+
443448
PACKAGE_ARCH:pn-packagegroup-youtube-widgets = "${MIDDLEWARE_ARCH}"
444449

conf/include/generic-srcrev.inc

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@ SRCREV:pn-iarm-set-powerstate = "${SRCREV:pn-iarm-query-powerstate}"
3131
SRCREV:pn-iarm-event-sender = "${SRCREV:pn-iarm-query-powerstate}"
3232
SRCREV_key-simulator = "${SRCREV:pn-iarm-query-powerstate}"
3333
SRCREV_mfr-utils = "${SRCREV:pn-iarm-query-powerstate}"
34-
SRCREV:pn-rfc = "83b232e15e2f5bbd1b3dd9597b7f2e9086bd8c80"
35-
SRCREV:pn-sysint = "597e60a1ca7dfefa075b26c0ff567a064731b662"
36-
SRCREV_tr69hostif = "733f0d550bbb597931025689b35e0745688007de"
34+
SRCREV:pn-rfc = "b6da366e704a006394b33759f144c0a4256fd335"
35+
SRCREV:pn-sysint = "22db63f37079241592e84d62a795ab591fe797f8"
36+
SRCREV:pn-tr69hostif = "733f0d550bbb597931025689b35e0745688007de"
3737
SRCREV:pn-hdmicecheader = "5201b2f759b4ca8fd2a6f5db838d528f6477db0c"
38-
SRCREV:pn-tr69hostif-headers = "2e546d5de878a5c8ee7a3558099cdcddc28f10a4"
38+
SRCREV:pn-tr69hostif-headers = "733f0d550bbb597931025689b35e0745688007de"
3939
SRCREV:pn-dobby = "59381966b7251d46a28ef7897a290662ca6009cb"
4040
SRCREV:pn-memcr = "f46af4008d19cb527d5cede22bf0a3d0c7a8ed02"
4141
SRCREV:pn-gst-plugins-rdk = "2a713a366153cf38dcf7bbced0b0c9de828c34c7"
@@ -71,6 +71,7 @@ SRCREV:pn-dvbsubdecoder= "${SRCREV:pn-subttxrend-app}"
7171
SRCREV:pn-ttxdecoder = "${SRCREV:pn-subttxrend-app}"
7272
SRCREV:pn-rdkcertconfig = "e0e35743f7e96ad0595ac25b11d829b766f7062b"
7373
SRCREV:pn-packager-lisa = "53fea63b4fb6e5491364781dcdfd91bcc47397f8"
74-
SRCREV:pn-entservices-infra = "1040c5a89119e79ed3c0db61150c2f375a26d5ec"
74+
SRCREV:pn-entservices-infra = "841c73b9b2a77049617714f894a3cdb0700625fb"
7575
SRCREV:pn-xdial = "206d13783924f8ea90d48dbbcc9c199e45ffa783"
76+
SRCREV:pn-sceneset = "b9fc1bca0c1b42c72825ae1adecc07a7b6170c75"
7677
SRCREV:pn-packager-headers = "c18a6cdf4c87fc43bf920167781a537efa225eba"

recipes-core/packagegroups/packagegroup-middleware-layer.bb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,7 @@ RDEPENDS:${PN} = " \
170170
wlan-p2p \
171171
thunder-hang-recovery \
172172
thunder-plugin-activator \
173+
${@bb.utils.contains('DISTRO_FEATURES', 'sceneset', " sceneset ", "", d)} \
173174
"
174175

175176
DEPENDS += " cjson crun jsonrpc libarchive libdash libevent gssdp harfbuzz hiredis \

0 commit comments

Comments
 (0)