Skip to content

Commit e4b0bfa

Browse files
committed
Improve messages.
1 parent d4e84b9 commit e4b0bfa

2 files changed

Lines changed: 20 additions & 18 deletions

File tree

.github/workflows/deploy.yml

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -119,16 +119,18 @@ jobs:
119119
- name: Summarize the optimization run
120120
run: |
121121
echo '# Optimization run' >> "$GITHUB_STEP_SUMMARY"
122-
gh run view $deploy_run_id -j $optimize_job_id -R originlab/${{ matrix.site }} --log \
123-
| awk '/find pages\// {f=1} /upload-artifact/ {f=0} f' \
124-
| cut -f3- | cut -d' ' -f2- \
125-
| sed -E \
126-
-e 's/\r//g' \
127-
-e 's/\^\[\[[0-9;]*[a-zA-Z]//g' \
128-
-e 's/^##\[group\](.*)/<details><summary>\1<\/summary><pre>/g' \
129-
-e 's/^##\[endgroup\]/<\/pre><\/details>/g' \
130-
-e 's/^##\[notice\](.*)/> [!NOTE]\n> \1/g' \
131-
-e 's/^##\[warning\](.*)/> [!WARNING]\n> \1/g' \
122+
opt_log = $(gh run view $deploy_run_id -j $optimize_job_id -R originlab/${{ matrix.site }} --log \
123+
| awk '/find pages\// {f=1} /upload-artifact/ {f=0} f' \
124+
| cut -f3- | cut -d' ' -f2- \
125+
| sed -E -e 's/\r//g' -e 's/\^\[\[[0-9;]*[a-zA-Z]//g')
126+
127+
echo "$opt_log" | grep '^##\[warning\]' | sed -E 's/^##\[warning\](.*)/\n> [!WARNING]\n> \1/' >> "$GITHUB_STEP_SUMMARY"
128+
129+
if echo "$opt_log" | grep -q '^##\[notice\]'; then
130+
echo -e "\n<details><summary>Notices</summary><pre>" >> "$GITHUB_STEP_SUMMARY"
131+
echo "$opt_log" | grep '^##\[notice\]' | sed -E 's/^##\[notice\](.*)/- \1\n/' >> "$GITHUB_STEP_SUMMARY"
132+
echo -e "\n</pre></details>" >> "$GITHUB_STEP_SUMMARY"
133+
fi
132134
>> "$GITHUB_STEP_SUMMARY"
133135
134136
- name: Summarize artifacts

.github/workflows/publish_book.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -41,16 +41,16 @@ jobs:
4141
file="{}"
4242
output="{.}.webp"
4343
44-
err=$(cwebp -quiet -lossless -q 100 "$file" -o "$output" 2>&1 >/dev/null)
44+
msg=$(cwebp -quiet -lossless -q 100 "$file" -o "$output" 2>&1 >/dev/null)
4545
status=$?
4646
4747
if [ $status -eq 0 ]; then
4848
rm "$file"
49-
if [ -n "$err" ]; then
50-
echo "::notice::Optimized $file, but had warnings 👉 $err"
49+
if [ -n "$msg" ]; then
50+
echo "::notice file=$file::$msg"
5151
fi
5252
else
53-
echo "::warning::Skipped optimizing $file because 👉 $err"
53+
echo "::warning file=$file::Skipped because $msg"
5454
fi'
5555
5656
- name: Optimize gif images
@@ -60,16 +60,16 @@ jobs:
6060
file="{}"
6161
output="{.}.webp"
6262
63-
err=$(gif2webp -quiet -min_size -q 100 "$file" -o "$output" 2>&1 >/dev/null)
63+
msg=$(gif2webp -quiet -min_size -q 100 "$file" -o "$output" 2>&1 >/dev/null)
6464
status=$?
6565
6666
if [ $status -eq 0 ]; then
6767
rm "$file"
68-
if [ -n "$err" ]; then
69-
echo "::notice::Optimized $file, but had warnings 👉 $err"
68+
if [ -n "$msg" ]; then
69+
echo "::notice file=$file::$msg"
7070
fi
7171
else
72-
echo "::warning::Skipped optimizing $file because 👉 $err"
72+
echo "::warning file=$file::Skipped because $msg"
7373
fi'
7474
7575
- name: Optimize text

0 commit comments

Comments
 (0)