Skip to content

Commit bfbe28a

Browse files
Merge branch 'develop' into release/1.12.0
2 parents f1fafa1 + 5b1ea17 commit bfbe28a

File tree

3 files changed

+140
-38
lines changed

3 files changed

+140
-38
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: 15 additions & 25 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"
5+
PV:pn-devicesettings = "1.0.22"
66
PR:pn-devicesettings = "r0"
77
PACKAGE_ARCH:pn-devicesettings = "${MIDDLEWARE_ARCH}"
88

@@ -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.6"
4646
PR:pn-tr69hostif = "r0"
4747
PACKAGE_ARCH:pn-tr69hostif = "${MIDDLEWARE_ARCH}"
4848

@@ -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.2"
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,15 +124,11 @@ 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.12"
136132
PR:pn-entservices-casting = "r0"
137133
PACKAGE_ARCH:pn-entservices-casting = "${MIDDLEWARE_ARCH}"
138134

@@ -144,15 +140,15 @@ PV:pn-entservices-deviceanddisplay = "3.2.9"
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.1.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.4.11"
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.4"
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

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

242236
PACKAGE_ARCH:pn-wpeframework = "${MIDDLEWARE_ARCH}"
243237

244-
PV:pn-entservices-apis = "1.17.0"
238+
PV:pn-entservices-apis = "2.0.1"
245239
PR:pn-entservices-apis = "r0"
246240
PACKAGE_ARCH:pn-entservices-apis = "${MIDDLEWARE_ARCH}"
247241

@@ -270,7 +264,7 @@ PV:pn-xdial = "1.0.0"
270264
PR:pn-xdial = "r0"
271265
PACKAGE_ARCH:pn-xdial = "${MIDDLEWARE_ARCH}"
272266

273-
PV:pn-sysint = "3.0.7"
267+
PV:pn-sysint = "3.0.8"
274268
PR:pn-sysint = "r0"
275269
PACKAGE_ARCH:pn-sysint = "${MIDDLEWARE_ARCH}"
276270

@@ -304,7 +298,7 @@ PV:pn-packagemanager = "4.4.1"
304298
PR:pn-packagemanager = "r0"
305299
PACKAGE_ARCH:pn-packagemanager = "${MIDDLEWARE_ARCH}"
306300

307-
PV:pn-thunderstartupservices = "1.0.22"
301+
PV:pn-thunderstartupservices = "1.0.23"
308302
PR:pn-thunderstartupservices = "r0"
309303
PACKAGE_ARCH:pn-thunderstartupservices = "${MIDDLEWARE_ARCH}"
310304

@@ -363,7 +357,7 @@ PACKAGE_ARCH:pn-wlan-p2p = "${MIDDLEWARE_ARCH}"
363357
MULTILIB_VARIANTS:pn-os-release = " multilib "
364358
PACKAGE_ARCH:pn-os-release = "${MIDDLEWARE_ARCH}"
365359

366-
PV:pn-subttxrend-app = "1.4.0"
360+
PV:pn-subttxrend-app = "1.5.0"
367361
PR:pn-subttxrend-app = "r0"
368362
PACKAGE_ARCH:pn-subttxrend-app = "${MIDDLEWARE_ARCH}"
369363

@@ -423,10 +417,6 @@ PV:pn-ttxdecoder = "${PV:pn-subttxrend-app}"
423417
PR:pn-ttxdecoder = "r0"
424418
PACKAGE_ARCH:pn-ttxdecoder = "${MIDDLEWARE_ARCH}"
425419

426-
PV:pn-lsof = "4.94.0"
427-
PR:pn-lsof = "r0"
428-
PACKAGE_ARCH:pn-lsof = "${MIDDLEWARE_ARCH}"
429-
430420
PV:pn-rdkcertconfig = "1.0.1"
431421
PR:pn-rdkcertconfig = "r0"
432422
PACKAGE_ARCH:rdkcertconfig = "${MIDDLEWARE_ARCH}"

conf/include/generic-srcrev.inc

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
SRCREV_rdk-apparmor-profiles = "0e9b3f4d100c23a99427891f6dcb417e77fe7b00"
22
SRCREV_rdk-libunpriv = "547d202d421ed83bd60b677b5d057cad3b7ae8ad"
33
SRCREV:pn-rdkat = "e52ebe05b6703dff7ca700fd286d84c0c72c41ea"
4-
SRCREV:pn-ctrlm-main = "512407a852d5aae9a5340a30264585532b4a91da"
4+
SRCREV:pn-ctrlm-main = "46ccf07027ef234181ae24917a8a1cf6b6802df1"
55
SRCREV:pn-ctrlm-headers = "${SRCREV:pn-ctrlm-main}"
6-
SRCREV:pn-xr-voice-sdk = "b628e1ac2b8b149e87de650ca87d6b78969521c4"
6+
SRCREV:pn-xr-voice-sdk = "5eda37f9e95767fcbe2893a52e3b6b1fafd0135c"
77
SRCREV:pn-xr-voice-sdk-headers = "${SRCREV:pn-xr-voice-sdk}"
88
SRCREV_hdmicec = "b407684e91a936a07fadf4ef393505a5d06db890"
99
SRCREV:pn-rmfosal = "ea4f0df1edd73cc2d45d453ad445cb2536799684"
@@ -13,29 +13,28 @@ SRCREV_iarmbus = "6dd8bd51b96cec8df3416fd162cee3dd2c089a26"
1313
SRCREV:pn-iarmmgrs = "8cc5174ebe2e40c48d808d6a7571499e9f539720"
1414
SRCREV:pn-iarmmgrs-hal-headers = "${SRCREV:pn-iarmmgrs}"
1515
SRCREV:pn-rdk-gstreamer-utils = "ea9c7ec1a810053619596123f5bd6fd22b3215f4"
16-
SRCREV_devicesettings = "43478032d2ad20097fb13491cbc42acc2fbb77ce"
16+
SRCREV_devicesettings = "9d6edc7f0c2ef741309d84f0b6019a97b99f18bc"
1717
SRCREV:pn-bluetooth-mgr = "b284d24692988285e449252829eacc78214634b5"
1818
SRCREV:pn-bluetooth-core = "7a179b790530becb8e620057e7d57922ddafff21"
1919
SRCREV_rdkversion = "d461bbd2fc8299f6e5056f488ff944e90142e9b6"
2020
SRCREV:pn-telemetry = "0d73470cc038f1e47ffee483a7d05e51bf88751e"
2121
SRCREV:pn-dcmd = "03974134e21b316d4053de6574df14b3a423c8d6"
22-
SRCREV:pn-jquery = "0a863e17c601964a7b2afed71a9e781d43fdf8ec"
2322
SRCREV:pn-crashupload = "8e7e22d2cb988ea58b9ba9d85b8b0812c6dc77d2"
2423
SRCREV:pn-remotedebugger = "300d29e105f6a7244bff81fa0357dac914dd8913"
2524
SRCREV:pn-libsyswrapper = "5143ba5b92f5dc77b436837d51f2f612d5846b7b"
2625
SRCREV:pn-commonutilities = "071361f284ba9049bf7d8cb9a75b583b9b1e353b"
27-
SRCREV_rdkfw = "94267d12b1c8f9ee1f8cd235acb8462769c15589"
26+
SRCREV_rdkfw = "4bd6cd8e3514ce65e05f74577da9e3de40caebd8"
2827
SRCREV:pn-rdkperf = "d802d561c4a2a4456403d572da75e73032d48d91"
29-
SRCREV:pn-iarm-query-powerstate = "bccda2514f8c123b3a24c72cf37b519b7623b270"
28+
SRCREV:pn-iarm-query-powerstate = "a309758f5721a10ff8cdfa3ef8b957f7614a2d29"
3029
SRCREV:pn-iarm-set-powerstate = "${SRCREV:pn-iarm-query-powerstate}"
3130
SRCREV:pn-iarm-event-sender = "${SRCREV:pn-iarm-query-powerstate}"
3231
SRCREV_key-simulator = "${SRCREV:pn-iarm-query-powerstate}"
3332
SRCREV_mfr-utils = "${SRCREV:pn-iarm-query-powerstate}"
34-
SRCREV:pn-rfc = "83b232e15e2f5bbd1b3dd9597b7f2e9086bd8c80"
35-
SRCREV:pn-sysint = "22db63f37079241592e84d62a795ab591fe797f8"
36-
SRCREV:pn-tr69hostif = "733f0d550bbb597931025689b35e0745688007de"
33+
SRCREV:pn-rfc = "b6da366e704a006394b33759f144c0a4256fd335"
34+
SRCREV:pn-sysint = "417596d0e8d3f71c8b98c7b36a32c205e16cd760"
35+
SRCREV_tr69hostif = "2e546d5de878a5c8ee7a3558099cdcddc28f10a4"
3736
SRCREV:pn-hdmicecheader = "5201b2f759b4ca8fd2a6f5db838d528f6477db0c"
38-
SRCREV:pn-tr69hostif-headers = "733f0d550bbb597931025689b35e0745688007de"
37+
SRCREV:pn-tr69hostif-headers = "2e546d5de878a5c8ee7a3558099cdcddc28f10a4"
3938
SRCREV:pn-dobby = "59381966b7251d46a28ef7897a290662ca6009cb"
4039
SRCREV:pn-memcr = "f46af4008d19cb527d5cede22bf0a3d0c7a8ed02"
4140
SRCREV:pn-gst-plugins-rdk = "2a713a366153cf38dcf7bbced0b0c9de828c34c7"
@@ -47,14 +46,14 @@ SRCREV_systemtimemgrfactory="f327d55479d559bfb94803d2e6d60501ab32f9f2"
4746
SRCREV_starboard = "d23e2da63e840f04a1bfa5cf1f2a1e7b0c261102"
4847
SRCREV_systemtimemgr = "f327d55479d559bfb94803d2e6d60501ab32f9f2"
4948
SRCREV:pn-rdkshell = "a0a88b812d39ee57b15b48f00488c4d9ba737f14"
50-
SRCREV:pn-thunderstartupservices = "ff48b86afb638d614ed4b225db2c6aae88cbf09c"
49+
SRCREV:pn-thunderstartupservices = "d73e668dbbdb08054bdd40d99d2ee2a1b9613cef"
5150
SRCREV:pn-rialto-gstreamer = "dc9ac557005b504ba3a55fb0e8d6f822d9a8e809"
5251
SRCREV:pn-rialto = "44518bccc30f00102157b6b212983e05872b1de2"
5352
SRCREV:pn-rialto-ocdm = "c6dfab8221518787a8267269aa7ce4b5f1ba3fcb"
5453
SRCREV:pn-xmidt-agent = "a42eef93f5f129da6a25f1ce5386b2ee"
5554
SRCREV:pn-rdmagent = "ad72a998000815c4d11b3ab0a7124aac77eb0a4c"
5655
SRCREV:pn-rdkwindowmanager = "118bda43f9aff719f425b908bd52879b95df83de"
57-
SRCREV:pn-subttxrend-app = "7a2c94b2b2ccd90b1a494d51f314fa1118b4bbf8"
56+
SRCREV:pn-subttxrend-app = "72ecd131bbd1ff569a62cb6df3928290e5a570d2"
5857
SRCREV:pn-subttxrend-ctrl = "${SRCREV:pn-subttxrend-app}"
5958
SRCREV:pn-subttxrend-dbus = "${SRCREV:pn-subttxrend-app}"
6059
SRCREV:pn-subttxrend-dvbsub = "${SRCREV:pn-subttxrend-app}"
@@ -71,7 +70,7 @@ SRCREV:pn-dvbsubdecoder= "${SRCREV:pn-subttxrend-app}"
7170
SRCREV:pn-ttxdecoder = "${SRCREV:pn-subttxrend-app}"
7271
SRCREV:pn-rdkcertconfig = "e0e35743f7e96ad0595ac25b11d829b766f7062b"
7372
SRCREV:pn-packager-lisa = "53fea63b4fb6e5491364781dcdfd91bcc47397f8"
74-
SRCREV:pn-entservices-infra = "1040c5a89119e79ed3c0db61150c2f375a26d5ec"
73+
SRCREV:pn-entservices-infra = "e538ca1c22389aff2e3e9b9be3e603ff432ac874"
7574
SRCREV:pn-xdial = "206d13783924f8ea90d48dbbcc9c199e45ffa783"
7675
SRCREV:pn-sceneset = "b9fc1bca0c1b42c72825ae1adecc07a7b6170c75"
7776
SRCREV:pn-packager-headers = "c18a6cdf4c87fc43bf920167781a537efa225eba"

0 commit comments

Comments
 (0)