Merge pull request #1446 from snyk/fix/issue-tagging-script-regex

Fix issue parsing in issue tagging script

Author: sundowndev-snyk

scripts/issue-tagging.sh

@@ -28,6 +28,8 @@ if ! $GHCLI_BIN auth status &> /dev/null; then
     exit 1
 fi
 
+echo "Finding merged pull requests between $BASE_TAG and $LATEST_TAG..."
+
 # Compare $BASE_TAG branch with the latest tag
 # Keep IDs of merged pull requests
 PRs=$(git log --pretty=oneline "$BASE_TAG"..."$LATEST_TAG" | grep 'Merge pull request #' | grep -oE '#[0-9]+' | sed 's/#//')
@@ -36,7 +38,7 @@ PRs=$(git log --pretty=oneline "$BASE_TAG"..."$LATEST_TAG" | grep 'Merge pull re
 EXIT_CODE=0
 ISSUES=()
 for pr in $PRs; do
-    id=$($GHCLI_BIN pr view "$pr" --json body | grep -oE 'Related issues | (.*)?[0-9]+(.*)?\|' | sed 's/[^[:digit:]]//g' | sed -z 's/\n//g' || true)
+    id=$($GHCLI_BIN pr view "$pr" --json body | grep -oE '(Related issues \| )(.*)?[0-9]+(.*|\r|\n)?(\|)' | sed 's/[^[:digit:]]//g' | sed -z 's/\n//g' || true)
     if [ -z "$id" ]; then
         continue
     fi
@@ -48,6 +50,10 @@ for pr in $PRs; do
     ISSUES+=("$id")
 done
 
+# Remove duplicate IDs
+# This can happen when we release using a separate branch (e.g. patch releases)
+mapfile -t ISSUES < <(printf "%s\n" "${ISSUES[@]}" | sort -u)
+
 echo "Creating milestone $LATEST_TAG in github.com/$REPO"
 curl -X POST \
     -H "Accept: application/vnd.github.v3+json" \