Merge remote-tracking branch 'upstream/test-redirect-gh-action' into regex

Author: norareidy

.github/workflows/add-redirects.yml

@@ -52,18 +52,14 @@ jobs:
             new="${new#source}"
             new="${new%.txt}"
             
-            # single quotes = ${var} rendered literally; double quotes = $var interpreted
             redirect='${prefix}/${version}'"$old"'/ -> ${base}/${version}'"$new"'/'
 
             # if redirect not already in file, add to string to add to PR description
             if ! grep -qx "$redirect" $REDIRECTS_FILE; then
-              renamed_redirects+="$redirect,"
+              renamed_redirects+="<li>[&lt;v&gt;-*]: $redirect</li>"
             fi
           done
 
-          # cut trailing comma
-          renamed_redirects="${renamed_redirects%,}"
-
           echo "redirects=${renamed_redirects}" >> "$GITHUB_OUTPUT"  
 
       - name: Find Missing Redirects for Deleted Files
@@ -86,18 +82,14 @@ jobs:
             old="${old#source}"
             old="${old%.txt}"
             
-            # single quotes = ${var} rendered literally; double quotes = $var interpreted
             redirect='${prefix}/${version}'"$old"'/ -> ${base}/${version}/'
                        
             # if redirect not already in file, add to string to add to PR description
             if ! grep -qx "$redirect" $REDIRECTS_FILE; then 
-              deleted_redirects+="$redirect,"
+              deleted_redirects+="<li>[&lt;v&gt;-*]: $redirect</li>"
             fi
           done
           
-          # cut trailing comma
-          deleted_redirects="${deleted_redirects%,}"
-
           echo "redirects=${deleted_redirects}" >> "$GITHUB_OUTPUT"  
 
       - name: Build Redirect HTML
@@ -106,24 +98,14 @@ jobs:
           RENAMED_REDIRECTS: ${{ steps.renamed-files.outputs.redirects }}
           DELETED_REDIRECTS: ${{ steps.deleted-files.outputs.redirects }}
         run: |
-          # empty string that stays empty if there are no redirects to suggest
-          redirect_html=""
-          
-          combined_redirect_string="${RENAMED_REDIRECTS},${DELETED_REDIRECTS}"
-
-          IFS=','
-          for redirect in $combined_redirect_string; do
-            if [[ ! -z "$redirect" ]]; then
-              if [[ -z "$redirect_html" ]]; then
-                redirect_html="<i>Suggested redirects for moved/deleted files (replace &lt;v&gt; with earliest backport target version):</i>"
-              fi
-              redirect_html+="<li>[&lt;v&gt;-\*]: $redirect</li>"  
-            fi  
-          done
+        
+          combined_redirects="${RENAMED_REDIRECTS}${DELETED_REDIRECTS}"
+          redirect_html="<i>Suggested redirects for moved/deleted files (replace &lt;v&gt; with earliest backport target version):</i> $combined_redirects</i>"
 
           echo "redirect_html=${redirect_html}" >> "$GITHUB_OUTPUT"
 
       - name: Update PR Description
+        if: steps.renamed-files.outputs.redirects != '' || steps.deleted-files.outputs.redirects != ''
         uses: MongoCaleb/pr-description-action@4bdfe35b98f64532b419ad20b350a92546cd3aa1
         with:
           regex: "- \\[ \\] Did you add redirects\\?.*"