Skip to content

Commit eacf240

Browse files
authored
Merge pull request #5076 from ralfhandl/main-more-precise-sync
main: more precise sync to dev branches
2 parents e68051b + 3050196 commit eacf240

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
@@ -45,9 +45,9 @@ jobs:
4545
4646
git checkout -b $SYNC origin/$SYNC || git checkout -b $SYNC origin/$BASE
4747
git merge origin/$HEAD -m "Merge $HEAD into $SYNC"
48-
git checkout origin/$BASE src/*
49-
git checkout origin/$BASE tests/*
50-
git commit -m "Restored src/* and tests/*" || echo ""
48+
git checkout origin/$BASE src/
49+
git checkout origin/$BASE tests/schema/
50+
git commit -m "Restored src/ and tests/schema/" || echo ""
5151
git push -u origin $SYNC
5252
5353
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
@@ -41,9 +41,9 @@ jobs:
4141
4242
git checkout -b $SYNC origin/$SYNC || git checkout -b $SYNC origin/$BASE
4343
git merge origin/$HEAD -m "Merge $HEAD into $SYNC"
44-
git checkout origin/$BASE src/*
45-
git checkout origin/$BASE tests/*
46-
git commit -m "Restored src/* and tests/*" || echo ""
44+
git checkout origin/$BASE src/
45+
git checkout origin/$BASE tests/schema/
46+
git commit -m "Restored src/ and tests/schema/" || echo ""
4747
git push -u origin $SYNC
4848
4949
EXISTS=$(gh pr list --base $BASE --head $SYNC \

0 commit comments

Comments
 (0)