Skip to content

Commit 3050196

Browse files
committed
More precise restore
Sync changes in other subfolders of tests Avoid potential confusion with bash globbing
1 parent c22f7da commit 3050196

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

.github/workflows/sync-dev-to-vX.Y-dev.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@ jobs:
4444
4545
git checkout -b $SYNC origin/$SYNC || git checkout -b $SYNC origin/$BASE
4646
git merge origin/$HEAD -m "Merge $HEAD into $SYNC"
47-
git checkout origin/$BASE src/*
48-
git checkout origin/$BASE tests/*
49-
git commit -m "Restored src/* and tests/*" || echo ""
47+
git checkout origin/$BASE src/
48+
git checkout origin/$BASE tests/schema/
49+
git commit -m "Restored src/ and tests/schema/" || echo ""
5050
git push -u origin $SYNC
5151
5252
EXISTS=$(gh pr list --base $BASE --head $SYNC \

.github/workflows/sync-main-to-dev.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@ jobs:
4040
4141
git checkout -b $SYNC origin/$SYNC || git checkout -b $SYNC origin/$BASE
4242
git merge origin/$HEAD -m "Merge $HEAD into $SYNC"
43-
git checkout origin/$BASE src/*
44-
git checkout origin/$BASE tests/*
45-
git commit -m "Restored src/* and tests/*" || echo ""
43+
git checkout origin/$BASE src/
44+
git checkout origin/$BASE tests/schema/
45+
git commit -m "Restored src/ and tests/schema/" || echo ""
4646
git push -u origin $SYNC
4747
4848
EXISTS=$(gh pr list --base $BASE --head $SYNC \

0 commit comments

Comments
 (0)