Skip to content

Commit d9b31e5

Browse files
authored
Fix regexp in sync-content-to-next.yml
1 parent 0523d46 commit d9b31e5

File tree

1 file changed

+9
-8
lines changed

1 file changed

+9
-8
lines changed

.github/workflows/sync-content-to-next.yml

+9-8
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,8 @@ jobs:
7676
echo "Modified files:"
7777
echo "$MODIFIED_FILES"
7878
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/')
8081
8182
if [ -z "$INVALID_FILES" ]; then
8283
echo "All files are in content folders. Proceeding."
@@ -106,9 +107,9 @@ jobs:
106107
107108
echo "Attempting cherry-pick of commit ${{ steps.get-commit.outputs.commit_hash }}..."
108109
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
110111
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/')
112113
echo "Conflicted files:"
113114
echo "$CONFLICTED_FILES"
114115
git add $(echo "$CONFLICTED_FILES")
@@ -166,8 +167,8 @@ jobs:
166167
echo "Files in PR:"
167168
echo "$PR_FILES"
168169
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/')
171172
172173
if [ -z "$INVALID_FILES" ]; then
173174
echo "All files are in content folders. Proceeding."
@@ -210,7 +211,7 @@ jobs:
210211
211212
# Get each modified file that matches our criteria
212213
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/')
214215
echo "Content files to port:"
215216
echo "$CONTENT_FILES"
216217
@@ -286,9 +287,9 @@ jobs:
286287
echo "Attempting cherry-pick of merge commit ${{ steps.get-merge-commit.outputs.merge_commit }}..."
287288
# For a merge commit, we need to use -m 1 to cherry-pick the parent changes
288289
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
290291
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/')
292293
echo "Conflicted files:"
293294
echo "$CONFLICTED_FILES"
294295
git add $(echo "$CONFLICTED_FILES")

0 commit comments

Comments
 (0)