|
76 | 76 | echo "Modified files:"
|
77 | 77 | echo "$MODIFIED_FILES"
|
78 | 78 |
|
79 |
| - INVALID_FILES=$(echo "$MODIFIED_FILES" | grep -v -E '^(docusaurus/docs/cms/|docusaurus/docs/cloud/|docusaurus/static/img/assets/)') |
| 79 | + # Correction de l'expression régulière pour correspondre correctement aux chemins |
| 80 | + INVALID_FILES=$(echo "$MODIFIED_FILES" | grep -v -E '^docusaurus/docs/(cms|cloud)/|^docusaurus/static/img/assets/') |
80 | 81 |
|
81 | 82 | if [ -z "$INVALID_FILES" ]; then
|
82 | 83 | echo "All files are in content folders. Proceeding."
|
@@ -106,9 +107,9 @@ jobs:
|
106 | 107 |
|
107 | 108 | echo "Attempting cherry-pick of commit ${{ steps.get-commit.outputs.commit_hash }}..."
|
108 | 109 | git cherry-pick ${{ steps.get-commit.outputs.commit_hash }} || {
|
109 |
| - if git diff --name-only --diff-filter=U | grep -q -E '^(docusaurus/docs/cms/|docusaurus/docs/cloud/|docusaurus/static/img/assets/)'; then |
| 110 | + if git diff --name-only --diff-filter=U | grep -q -E '^docusaurus/docs/(cms|cloud)/|^docusaurus/static/img/assets/'; then |
110 | 111 | echo "Conflicts detected in content files, attempting to resolve..."
|
111 |
| - CONFLICTED_FILES=$(git diff --name-only --diff-filter=U | grep -E '^(docusaurus/docs/cms/|docusaurus/docs/cloud/|docusaurus/static/img/assets/)') |
| 112 | + CONFLICTED_FILES=$(git diff --name-only --diff-filter=U | grep -E '^docusaurus/docs/(cms|cloud)/|^docusaurus/static/img/assets/') |
112 | 113 | echo "Conflicted files:"
|
113 | 114 | echo "$CONFLICTED_FILES"
|
114 | 115 | git add $(echo "$CONFLICTED_FILES")
|
@@ -166,8 +167,8 @@ jobs:
|
166 | 167 | echo "Files in PR:"
|
167 | 168 | echo "$PR_FILES"
|
168 | 169 |
|
169 |
| - # Check if all files are in allowed directories |
170 |
| - INVALID_FILES=$(echo "$PR_FILES" | grep -v -E '^(docusaurus/docs/cms/|docusaurus/docs/cloud/|docusaurus/static/img/assets/)') |
| 170 | + # Correction de l'expression régulière pour correspondre correctement aux chemins |
| 171 | + INVALID_FILES=$(echo "$PR_FILES" | grep -v -E '^docusaurus/docs/(cms|cloud)/|^docusaurus/static/img/assets/') |
171 | 172 |
|
172 | 173 | if [ -z "$INVALID_FILES" ]; then
|
173 | 174 | echo "All files are in content folders. Proceeding."
|
@@ -210,7 +211,7 @@ jobs:
|
210 | 211 |
|
211 | 212 | # Get each modified file that matches our criteria
|
212 | 213 | echo "Getting content files from PR..."
|
213 |
| - CONTENT_FILES=$(echo "$PR_FILES" | grep -E '^(docusaurus/docs/cms/|docusaurus/docs/cloud/|docusaurus/static/img/assets/)') |
| 214 | + CONTENT_FILES=$(echo "$PR_FILES" | grep -E '^docusaurus/docs/(cms|cloud)/|^docusaurus/static/img/assets/') |
214 | 215 | echo "Content files to port:"
|
215 | 216 | echo "$CONTENT_FILES"
|
216 | 217 |
|
@@ -286,9 +287,9 @@ jobs:
|
286 | 287 | echo "Attempting cherry-pick of merge commit ${{ steps.get-merge-commit.outputs.merge_commit }}..."
|
287 | 288 | # For a merge commit, we need to use -m 1 to cherry-pick the parent changes
|
288 | 289 | git cherry-pick -m 1 ${{ steps.get-merge-commit.outputs.merge_commit }} || {
|
289 |
| - if git diff --name-only --diff-filter=U | grep -q -E '^(docusaurus/docs/cms/|docusaurus/docs/cloud/|docusaurus/static/img/assets/)'; then |
| 290 | + if git diff --name-only --diff-filter=U | grep -q -E '^docusaurus/docs/(cms|cloud)/|^docusaurus/static/img/assets/'; then |
290 | 291 | echo "Conflicts detected in content files, attempting to resolve..."
|
291 |
| - CONFLICTED_FILES=$(git diff --name-only --diff-filter=U | grep -E '^(docusaurus/docs/cms/|docusaurus/docs/cloud/|docusaurus/static/img/assets/)') |
| 292 | + CONFLICTED_FILES=$(git diff --name-only --diff-filter=U | grep -E '^docusaurus/docs/(cms|cloud)/|^docusaurus/static/img/assets/') |
292 | 293 | echo "Conflicted files:"
|
293 | 294 | echo "$CONFLICTED_FILES"
|
294 | 295 | git add $(echo "$CONFLICTED_FILES")
|
|
0 commit comments