Skip to content

Commit 1bb5166

Browse files
committed
Merge remote-tracking branch 'upstream/test-redirect-gh-action' into regex
2 parents 488f61e + eb749d9 commit 1bb5166

File tree

1 file changed

+6
-24
lines changed

1 file changed

+6
-24
lines changed

.github/workflows/add-redirects.yml

Lines changed: 6 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -52,18 +52,14 @@ jobs:
5252
new="${new#source}"
5353
new="${new%.txt}"
5454
55-
# single quotes = ${var} rendered literally; double quotes = $var interpreted
5655
redirect='${prefix}/${version}'"$old"'/ -> ${base}/${version}'"$new"'/'
5756
5857
# if redirect not already in file, add to string to add to PR description
5958
if ! grep -qx "$redirect" $REDIRECTS_FILE; then
60-
renamed_redirects+="$redirect,"
59+
renamed_redirects+="<li>[&lt;v&gt;-*]: $redirect</li>"
6160
fi
6261
done
6362
64-
# cut trailing comma
65-
renamed_redirects="${renamed_redirects%,}"
66-
6763
echo "redirects=${renamed_redirects}" >> "$GITHUB_OUTPUT"
6864
6965
- name: Find Missing Redirects for Deleted Files
@@ -86,18 +82,14 @@ jobs:
8682
old="${old#source}"
8783
old="${old%.txt}"
8884
89-
# single quotes = ${var} rendered literally; double quotes = $var interpreted
9085
redirect='${prefix}/${version}'"$old"'/ -> ${base}/${version}/'
9186
9287
# if redirect not already in file, add to string to add to PR description
9388
if ! grep -qx "$redirect" $REDIRECTS_FILE; then
94-
deleted_redirects+="$redirect,"
89+
deleted_redirects+="<li>[&lt;v&gt;-*]: $redirect</li>"
9590
fi
9691
done
9792
98-
# cut trailing comma
99-
deleted_redirects="${deleted_redirects%,}"
100-
10193
echo "redirects=${deleted_redirects}" >> "$GITHUB_OUTPUT"
10294
10395
- name: Build Redirect HTML
@@ -106,24 +98,14 @@ jobs:
10698
RENAMED_REDIRECTS: ${{ steps.renamed-files.outputs.redirects }}
10799
DELETED_REDIRECTS: ${{ steps.deleted-files.outputs.redirects }}
108100
run: |
109-
# empty string that stays empty if there are no redirects to suggest
110-
redirect_html=""
111-
112-
combined_redirect_string="${RENAMED_REDIRECTS},${DELETED_REDIRECTS}"
113-
114-
IFS=','
115-
for redirect in $combined_redirect_string; do
116-
if [[ ! -z "$redirect" ]]; then
117-
if [[ -z "$redirect_html" ]]; then
118-
redirect_html="<i>Suggested redirects for moved/deleted files (replace &lt;v&gt; with earliest backport target version):</i>"
119-
fi
120-
redirect_html+="<li>[&lt;v&gt;-\*]: $redirect</li>"
121-
fi
122-
done
101+
102+
combined_redirects="${RENAMED_REDIRECTS}${DELETED_REDIRECTS}"
103+
redirect_html="<i>Suggested redirects for moved/deleted files (replace &lt;v&gt; with earliest backport target version):</i> $combined_redirects</i>"
123104
124105
echo "redirect_html=${redirect_html}" >> "$GITHUB_OUTPUT"
125106
126107
- name: Update PR Description
108+
if: steps.renamed-files.outputs.redirects != '' || steps.deleted-files.outputs.redirects != ''
127109
uses: MongoCaleb/pr-description-action@4bdfe35b98f64532b419ad20b350a92546cd3aa1
128110
with:
129111
regex: "- \\[ \\] Did you add redirects\\?.*"

0 commit comments

Comments
 (0)