Skip to content

Commit 99a6822

Browse files
Merge pull request #2267 from rdkcentral/release/1.13.0
RDKEMW-10596: Merge Release branch to Main for MW 8.4.2.0 Q4 Monthly Develop Release
2 parents 2682d96 + cd7c86a commit 99a6822

File tree

4 files changed

+168
-60
lines changed

4 files changed

+168
-60
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: 33 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ PV:pn-apparmor-generic="1.1.0"
22
PR:pn-apparmor-generic = "r0"
33
PACKAGE_ARCH:pn-apparmor-generic = "${MIDDLEWARE_ARCH}"
44

5-
PV:pn-devicesettings = "1.0.20-hotfix.1"
5+
PV:pn-devicesettings = "1.0.22"
66
PR:pn-devicesettings = "r0"
77
PACKAGE_ARCH:pn-devicesettings = "${MIDDLEWARE_ARCH}"
88

@@ -18,15 +18,15 @@ PV:pn-iarmbus = "1.0.2"
1818
PR:pn-iarmbus = "r0"
1919
PACKAGE_ARCH:pn-iarmbus = "${MIDDLEWARE_ARCH}"
2020

21-
PV:pn-iarmmgrs = "1.1.3"
21+
PV:pn-iarmmgrs = "1.1.4"
2222
PR:pn-iarmmgrs = "r0"
2323
PACKAGE_ARCH:pn-iarmmgrs = "${MIDDLEWARE_ARCH}"
2424

2525
PV:pn-rtcore = "1.0.1"
2626
PR:pn-rtcore = "r2"
2727
PACKAGE_ARCH:pn-rtcore = "${MIDDLEWARE_ARCH}"
2828

29-
PV:pn-rdknativescript = "1.0.8"
29+
PV:pn-rdknativescript = "1.0.10"
3030
PR:pn-rdknativescript = "r0"
3131
PACKAGE_ARCH:pn-rdknativescript = "${MIDDLEWARE_ARCH}"
3232

@@ -38,11 +38,11 @@ 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

45-
PV:pn-tr69hostif = "1.2.7"
45+
PV:pn-tr69hostif = "1.2.8"
4646
PR:pn-tr69hostif = "r0"
4747
PACKAGE_ARCH:pn-tr69hostif = "${MIDDLEWARE_ARCH}"
4848

@@ -62,7 +62,7 @@ PV:pn-dcmd = "1.2.0"
6262
PR:pn-dcmd = "r0"
6363
PACKAGE_ARCH:pn-dcmd = "${MIDDLEWARE_ARCH}"
6464

65-
PV:pn-tr69hostif-headers = "1.2.6"
65+
PV:pn-tr69hostif-headers = "1.2.8"
6666
PR:pn-tr69hostif-headers = "r0"
6767
PACKAGE_ARCH:pn-tr69hostif-headers = "${MIDDLEWARE_ARCH}"
6868

@@ -78,7 +78,7 @@ PV:pn-qtwayland = "5.15.7"
7878
PR:pn-qtwayland = "r1"
7979
PACKAGE_ARCH:pn-qtwayland = "${MIDDLEWARE_ARCH}"
8080

81-
PV:pn-aamp = "2.9.2"
81+
PV:pn-aamp = "2.10.0"
8282
PR:pn-aamp = "r0"
8383
PACKAGE_ARCH:pn-aamp = "${MIDDLEWARE_ARCH}"
8484

@@ -98,13 +98,13 @@ PV:pn-commonutilities = "1.4.3"
9898
PR:pn-commonutilities = "r0"
9999
PACKAGE_ARCH:pn-commonutilities = "${MIDDLEWARE_ARCH}"
100100

101-
PV:pn-rdkfwupgrader = "1.3.1"
101+
PV:pn-rdkfwupgrader = "1.3.3"
102102
PR:pn-rdkfwupgrader = "r0"
103103
PACKAGE_ARCH:pn-rdkfwupgrader = "${MIDDLEWARE_ARCH}"
104104

105105
# All of these iarm-query-powerstate, iarm-set-powerstate, iarm-event-sender,
106106
# key-simulator and mfr-utils use sys_mon_tools repo.
107-
PV:pn-iarm-query-powerstate = "1.0.7"
107+
PV:pn-iarm-query-powerstate = "1.0.8"
108108
PR:pn-iarm-query-powerstate = "r0"
109109
PACKAGE_ARCH:pn-iarm-query-powerstate = "${MIDDLEWARE_ARCH}"
110110

@@ -124,35 +124,31 @@ PV:pn-mfr-utils = "${PV:pn-iarm-query-powerstate}"
124124
PR:pn-mfr-utils = "${PR:pn-iarm-query-powerstate}"
125125
PACKAGE_ARCH:pn-mfr-utils = "${MIDDLEWARE_ARCH}"
126126

127-
PV:pn-jquery = "1.0.0"
128-
PR:pn-jquery = "r2"
129-
PACKAGE_ARCH:pn-jquery = "${MIDDLEWARE_ARCH}"
130-
131127
PV:pn-librsvg = "2.40.21"
132128
PR:pn-librsvg = "r0"
133129
PACKAGE_ARCH:pn-librsvg = "${MIDDLEWARE_ARCH}"
134130

135-
PV:pn-entservices-casting = "1.2.7"
131+
PV:pn-entservices-casting = "1.2.13"
136132
PR:pn-entservices-casting = "r0"
137133
PACKAGE_ARCH:pn-entservices-casting = "${MIDDLEWARE_ARCH}"
138134

139135
PV:pn-entservices-connectivity = "1.1.0"
140136
PR:pn-entservices-connectivity = "r0"
141137
PACKAGE_ARCH:pn-entservices-connectivity = "${MIDDLEWARE_ARCH}"
142138

143-
PV:pn-entservices-deviceanddisplay = "3.2.9.1"
139+
PV:pn-entservices-deviceanddisplay = "3.4.0-hotfix.1"
144140
PR:pn-entservices-deviceanddisplay = "r0"
145141
PACKAGE_ARCH:pn-entservices-deviceanddisplay = "${MIDDLEWARE_ARCH}"
146142

147-
PV:pn-entservices-infra = "2.1.0"
143+
PV:pn-entservices-infra = "3.6.0"
148144
PR:pn-entservices-infra = "r0"
149145
PACKAGE_ARCH:pn-entservices-infra = "${MIDDLEWARE_ARCH}"
150146

151-
PV:pn-entservices-inputoutput = "1.4.9"
147+
PV:pn-entservices-inputoutput = "1.5.1"
152148
PR:pn-entservices-inputoutput = "r0"
153149
PACKAGE_ARCH:pn-entservices-inputoutput = "${MIDDLEWARE_ARCH}"
154150

155-
PV:pn-entservices-mediaanddrm = "1.3.6"
151+
PV:pn-entservices-mediaanddrm = "1.3.7"
156152
PR:pn-entservices-mediaanddrm = "r0"
157153
PACKAGE_ARCH:pn-entservices-mediaanddrm = "${MIDDLEWARE_ARCH}"
158154

@@ -172,8 +168,6 @@ PV:pn-rdkshell = "1.0.0"
172168
PR:pn-rdkshell = "r0"
173169
PACKAGE_ARCH:pn-rdkshell = "${MIDDLEWARE_ARCH}"
174170

175-
PACKAGE_ARCH:pn-stunnel = "${MIDDLEWARE_ARCH}"
176-
177171
PV:pn-systimemgrfactory = "1.3.0"
178172
PR:pn-systimemgrfactory = "r0"
179173
PACKAGE_ARCH:pn-systimemgrfactory = "${MIDDLEWARE_ARCH}"
@@ -186,11 +180,11 @@ PV:pn-systimemgrinetrface = "1.3.0"
186180
PR:pn-systimemgrinetrface = "r0"
187181
PACKAGE_ARCH:pn-systimemgrinetrface = "${MIDDLEWARE_ARCH}"
188182

189-
PV:pn-ctrlm-main = "1.1.2"
183+
PV:pn-ctrlm-main = "1.1.5"
190184
PR:pn-ctrlm-main = "r0"
191185
PACKAGE_ARCH:pn-ctrlm-main = "${MIDDLEWARE_ARCH}"
192186

193-
PV:pn-xr-voice-sdk = "1.0.5"
187+
PV:pn-xr-voice-sdk = "1.0.6"
194188
PR:pn-xr-voice-sdk = "r0"
195189
PACKAGE_ARCH:pn-xr-voice-sdk = "${MIDDLEWARE_ARCH}"
196190

@@ -210,14 +204,18 @@ PV:pn-libsyswrapper = "1.3.3"
210204
PR:pn-libsyswrapper = "r1"
211205
PACKAGE_ARCH:pn-libsyswrapper = "${MIDDLEWARE_ARCH}"
212206

213-
PV_pn-rdk-logger = "2.3.0"
214-
PR_pn-rdk-logger = "r1"
207+
PV_pn-rdk-logger = "2.4.0"
208+
PR_pn-rdk-logger = "r0"
215209
PACKAGE_ARCH_pn-rdk-logger = "${MIDDLEWARE_ARCH}"
216210

217211
PV:pn-remotedebugger = "1.2.9"
218212
PR:pn-remotedebugger = "r0"
219213
PACKAGE_ARCH:pn-remotedebugger = "${MIDDLEWARE_ARCH}"
220214

215+
PV:pn-memcapture = "1.0.0"
216+
PR:pn-memcapture = "r0"
217+
PACKAGE_ARCH:pn-memcapture = "${MIDDLEWARE_ARCH}"
218+
221219
PV:pn-webkitbrowser-plugin = "1.1.30"
222220
PR:pn-webkitbrowser-plugin = "r0"
223221
PACKAGE_ARCH:pn-webkitbrowser-plugin = "${MIDDLEWARE_ARCH}"
@@ -241,7 +239,7 @@ PACKAGE_ARCH:pn-libflac = "${MIDDLEWARE_ARCH}"
241239

242240
PACKAGE_ARCH:pn-wpeframework = "${MIDDLEWARE_ARCH}"
243241

244-
PV:pn-entservices-apis = "1.17.0"
242+
PV:pn-entservices-apis = "2.4.0"
245243
PR:pn-entservices-apis = "r0"
246244
PACKAGE_ARCH:pn-entservices-apis = "${MIDDLEWARE_ARCH}"
247245

@@ -266,12 +264,12 @@ PACKAGE_ARCH_pn-webconfig-framework = "${MIDDLEWARE_ARCH}"
266264

267265
PACKAGE_ARCH:pn-rdksysctl = "${MIDDLEWARE_ARCH}"
268266

269-
PV:pn-xdial = "1.0.0"
267+
PV:pn-xdial = "1.0.1"
270268
PR:pn-xdial = "r0"
271269
PACKAGE_ARCH:pn-xdial = "${MIDDLEWARE_ARCH}"
272270

273-
PV:pn-sysint = "3.0.7"
274-
PR:pn-sysint = "r0"
271+
PV:pn-sysint = "4.0.1"
272+
PR:pn-sysint = "r2"
275273
PACKAGE_ARCH:pn-sysint = "${MIDDLEWARE_ARCH}"
276274

277275
PR:pn-bluez5 = "r5"
@@ -288,7 +286,7 @@ PV:pn-memcr = "1.0.2"
288286
PR:pn-memcr = "r0"
289287
PACKAGE_ARCH:pn-memcr = "${MIDDLEWARE_ARCH}"
290288

291-
PV:pn-networkmanager-plugin = "1.4.0"
289+
PV:pn-networkmanager-plugin = "1.8.0"
292290
PR:pn-networkmanager-plugin = "r0"
293291
PACKAGE_ARCH:pn-networkmanager-plugin = "${MIDDLEWARE_ARCH}"
294292

@@ -304,7 +302,7 @@ PV:pn-packagemanager = "4.4.1"
304302
PR:pn-packagemanager = "r0"
305303
PACKAGE_ARCH:pn-packagemanager = "${MIDDLEWARE_ARCH}"
306304

307-
PV:pn-thunderstartupservices = "1.0.22"
305+
PV:pn-thunderstartupservices = "1.2.1"
308306
PR:pn-thunderstartupservices = "r0"
309307
PACKAGE_ARCH:pn-thunderstartupservices = "${MIDDLEWARE_ARCH}"
310308

@@ -327,23 +325,23 @@ PV:pn-rdkwpasupplicantconfig = "1.0.0"
327325
PR:pn-rdkwpasupplicantconfig = "r0"
328326
PACKAGE_ARCH:pn-rdkwpasupplicantconfig = "${MIDDLEWARE_ARCH}"
329327

330-
PV:pn-rialto = "0.14.0"
328+
PV:pn-rialto = "0.14.2"
331329
PR:pn-rialto = "r0"
332330
PACKAGE_ARCH:pn-rialto = "${MIDDLEWARE_ARCH}"
333331

334-
PV:pn-rialto-gstreamer = "0.13.0"
332+
PV:pn-rialto-gstreamer = "0.13.1"
335333
PR:pn-rialto-gstreamer = "r0"
336334
PACKAGE_ARCH:pn-rialto-gstreamer = "${MIDDLEWARE_ARCH}"
337335

338-
PV:pn-rialto-ocdm = "0.9.1"
336+
PV:pn-rialto-ocdm = "0.9.3"
339337
PR:pn-rialto-ocdm = "r0"
340338
PACKAGE_ARCH:pn-rialto-ocdm = "${MIDDLEWARE_ARCH}"
341339

342340
PV:pn-xmidt-agent = "1.0.0"
343341
PR:pn-xmidt-agent = "r0"
344342
PACKAGE_ARCH:pn-xmidt-agent = "${MIDDLEWARE_ARCH}"
345343

346-
PV:pn-rdmagent = "2.1.1"
344+
PV:pn-rdmagent = "2.1.2"
347345
PR:pn-rdmagent = "r0"
348346
PACKAGE_ARCH:pn-rdmagent = "${MIDDLEWARE_ARCH}"
349347

@@ -363,7 +361,7 @@ PACKAGE_ARCH:pn-wlan-p2p = "${MIDDLEWARE_ARCH}"
363361
MULTILIB_VARIANTS:pn-os-release = " multilib "
364362
PACKAGE_ARCH:pn-os-release = "${MIDDLEWARE_ARCH}"
365363

366-
PV:pn-subttxrend-app = "1.4.0"
364+
PV:pn-subttxrend-app = "1.5.0"
367365
PR:pn-subttxrend-app = "r0"
368366
PACKAGE_ARCH:pn-subttxrend-app = "${MIDDLEWARE_ARCH}"
369367

@@ -423,10 +421,6 @@ PV:pn-ttxdecoder = "${PV:pn-subttxrend-app}"
423421
PR:pn-ttxdecoder = "r0"
424422
PACKAGE_ARCH:pn-ttxdecoder = "${MIDDLEWARE_ARCH}"
425423

426-
PV:pn-lsof = "4.94.0"
427-
PR:pn-lsof = "r0"
428-
PACKAGE_ARCH:pn-lsof = "${MIDDLEWARE_ARCH}"
429-
430424
PV:pn-rdkcertconfig = "1.0.1"
431425
PR:pn-rdkcertconfig = "r0"
432426
PACKAGE_ARCH:rdkcertconfig = "${MIDDLEWARE_ARCH}"

0 commit comments

Comments
 (0)