Skip to content

Commit 48bfbae

Browse files
fix: Updating pr-issue-validator-script (#5384)
* Updating pr-issue-validator-script * Update pr-issue-validator.yaml --------- Co-authored-by: Prakarsh <71125043+prakarsh-dt@users.noreply.github.com>
1 parent f544a33 commit 48bfbae

File tree

1 file changed

+12
-3
lines changed

1 file changed

+12
-3
lines changed

.github/workflows/pr-issue-validator.yaml

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,13 +63,18 @@ jobs:
6363
fi
6464
6565
### For ex: Fixes #2123
66-
pattern1="((Fixes|Resolves) #[0-9]+)"
66+
### For ex: Fixes: #2123
67+
pattern1="((Fixes|Resolves):? #[0-9]+)"
6768
6869
### For ex: Resolves https://github.com/devtron-labs/devtron/issues/2123
69-
pattern2="((Fixes|Resolves) https://github.com/devtron-labs/devtron/issues/[0-9]+)"
70+
pattern2="((Fixes|Resolves):? https://github.com/devtron-labs/devtron/issues/[0-9]+)"
71+
7072
7173
### For ex: Fixes devtron-labs/devtron#2123
72-
pattern3="((Fixes|Resolves) devtron-labs/devtron#[0-9]+)"
74+
pattern3="((Fixes|Resolves):? devtron-labs/devtron#[0-9]+)"
75+
76+
### For ex: Fixes [#4839](https://github.com/devtron-labs/devtron/issues/4839)
77+
pattern4="(Fixes|Resolves):?\s+\[#([0-9]+)\]"
7378
7479
# Get the pull request body
7580
PR_BODY=$(jq -r '.pull_request.body' $GITHUB_EVENT_PATH)
@@ -92,6 +97,10 @@ jobs:
9297
echo "$PR_BODY" | grep -iE "$pattern3" | head -n1 | awk -F '#' '{print $NF}' | tr -d '\r\n' > issue_num
9398
issue_num=$(cat issue_num)
9499
echo "issue_num is : $issue_num"
100+
elif echo "$PR_BODY" | grep -iEq "$pattern4"; then
101+
echo "$PR_BODY" | grep -oP "$pattern4" | head -n1 | grep -oP '#\K[0-9]+' | tr -d '\r\n' > issue_num
102+
issue_num=$(cat issue_num)
103+
echo "issue_num is : $issue_num"
95104
else
96105
echo "No Issue number detected hence failing the PR Validation check."
97106
if [[ $forked == true ]]; then

0 commit comments

Comments
 (0)