From 02857a065d8ecef8ca015d40aa5879386dc1ddad Mon Sep 17 00:00:00 2001
From: Stian Thorgersen <stianst@gmail.com>
Date: Mon, 4 Dec 2023 08:41:09 +0100
Subject: [PATCH] Fix auto labelling for release labels (#25249)

Closes #25248

Signed-off-by: stianst <stianst@gmail.com>
---
 .github/scripts/pr-find-issues.sh | 8 ++++----
 .github/workflows/label.yml       | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/scripts/pr-find-issues.sh b/.github/scripts/pr-find-issues.sh
index 30bdb4e6a8..267881b127 100755
--- a/.github/scripts/pr-find-issues.sh
+++ b/.github/scripts/pr-find-issues.sh
@@ -8,18 +8,17 @@ if [ "$REPO" == "" ]; then
 fi
 
 function parse_issues() {
-    echo "$1" | grep -i -P -o "(close|closes|closed|resolve|resolves|resolved) #[[:digit:]]*" | cut -d '#' -f 2 | sort -n
+    echo "$1" | grep -i -P -o "(close|closes|closed|resolve|resolves|resolved) https://github.com/$REPO/issues/[[:digit:]]*" | cut -d '/' -f 7 | sort -n
 }
 
 PR_JSON=$(gh api "/repos/$REPO/pulls/$PR")
-
-PR_BODY=$(echo "$PR_JSON" | jq .body)
+PR_BODY=$(echo "$PR_JSON" | jq -r .body)
 PR_MERGE_COMMIT_SHA=$(echo "$PR_JSON" | jq -r .merge_commit_sha)
 
 ISSUES=$(parse_issues "$PR_BODY")
 if [ "$ISSUES" == "" ]; then
     COMMIT_JSON=$(gh api "/repos/$REPO/commits/$PR_MERGE_COMMIT_SHA")
-    COMMIT_MESSAGE=$(echo "$COMMIT_JSON" | jq .commit.message)
+    COMMIT_MESSAGE=$(echo "$COMMIT_JSON" | jq -r .commit.message)
 
     ISSUES=$(parse_issues "$COMMIT_MESSAGE")
 fi
@@ -27,3 +26,4 @@ fi
 for i in $ISSUES; do
     echo "$i"
 done
+
diff --git a/.github/workflows/label.yml b/.github/workflows/label.yml
index 4bf5add7c9..5b3a17282b 100644
--- a/.github/workflows/label.yml
+++ b/.github/workflows/label.yml
@@ -1,4 +1,4 @@
-name: Labeler
+name: Labeller
 on:
   pull_request_target:
     types: closed