Merge branch 'main' into password_markup_manual

Samsung · Feb 29, 2024 · 1ee93c0 · 1ee93c0
2 parents 1d690d5 + e615f76
commit 1ee93c0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.github/workflows/review.yml b/.github/workflows/review.yml
@@ -122,8 +122,8 @@ jobs:
       - name: Get diff for review
         run: |
           # in case of difference - diff returns failure
-          if ! diff --color=always review_base/review_base.txt review_head/review_head.txt &>review_diff.txt; then
-            ansi2html --style 'pre {font-family: monospace; font-size: large}' <review_diff.txt  >review_diff.html
+          if ! diff --color=auto review_base/review_base.txt review_head/review_head.txt &>review_diff.txt; then
+            while IFS= read -r line; do echo -n $line; echo -e '\033[m'; done <review_diff.txt | ansi2html --style 'pre {font-family: monospace; font-size: large}' >review_diff.html
           else
             touch review_diff.html
           fi

diff --git a/snapshot.yaml b/snapshot.yaml
@@ -1,4 +1,4 @@
-# 20240227_2215
+# 20240229_0932
 - id: pBfFrJ0X
   sha: 2abd898038aa362391856f91fd4f5abe33e1e88a
   tag: v3.3.2-1-g2abd898