From 2e7f74914f975e748fd03e2cff39ab68ba7ec301 Mon Sep 17 00:00:00 2001 From: takahirom Date: Fri, 5 Jul 2024 10:36:28 +0900 Subject: [PATCH] Fix file name restriction for comparison CI --- .github/workflows/screenshot-comparison-comment.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/screenshot-comparison-comment.yml b/.github/workflows/screenshot-comparison-comment.yml index 78f1c9602..7b97f7140 100644 --- a/.github/workflows/screenshot-comparison-comment.yml +++ b/.github/workflows/screenshot-comparison-comment.yml @@ -66,7 +66,7 @@ jobs: # Check for invalid file names and add only valid ones exist_valid_files="false" for file in "${files_to_add[@]}"; do - if [[ $file =~ ^[a-zA-Z0-9_./-]+$ ]]; then + if [[ $file =~ ^[a-zA-Z0-9_./\[\]\- ]+$ ]]; then exist_valid_files="true" break fi @@ -83,7 +83,7 @@ jobs: # Check for invalid file names and add only valid ones for file in $files_to_add; do - if [[ "$file" =~ ^[a-zA-Z0-9_./-]+$ ]]; then + if [[ "$file" =~ ^[a-zA-Z0-9_./\[\]\- ]+$ ]]; then git add "$file" fi done @@ -99,7 +99,7 @@ jobs: shell: bash run: | # Find all the files ending with _compare.png in roborazzi folder - files=$(find . -type f -name "*_compare.png" | grep "roborazzi/" | grep -E "^[a-zA-Z0-9_./-]+$") + files=$(find . -type f -name "*_compare.png" | grep "roborazzi/" | grep -E "^[a-zA-Z0-9_./\[\]\- ]+$") delimiter="$(openssl rand -hex 8)" { echo "reports<<${delimiter}" @@ -115,6 +115,8 @@ jobs: # Get the file name and insert newlines every 20 characters fileName=$(basename "$file" | sed -r 's/(.{20})/\1
/g') urlPart="${BRANCH_NAME//#/%23}/${file//#/%23}" + urlPart="${urlPart//[/%5B}" + urlPart="${urlPart//]/%5D}" echo "| [$fileName](https://github.com/${{ github.repository }}/blob/$urlPart) | ![](https://github.com/${{ github.repository }}/blob/$urlPart?raw=true) |" >> "$GITHUB_OUTPUT" done echo "${delimiter}" >> "$GITHUB_OUTPUT"