Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .github/workflows/sync-dev-to-vX.Y-dev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,9 @@ jobs:
git checkout -b $SYNC origin/$SYNC || git checkout -b $SYNC origin/$BASE
git merge origin/$HEAD -m "Merge $HEAD into $SYNC"
git checkout origin/$BASE src/
git checkout origin/$BASE -- tests/schema/ ':*.mjs'
# exclude mjs files because we want to sync from the head
# neutralizes non-zero exit code because an empty selection result returns 1
git checkout origin/$BASE -- tests/schema/ ':!*.mjs' || echo ""
Comment thread
baywet marked this conversation as resolved.
git commit -m "Restored src/ and tests/schema/" || echo ""
git push -u origin $SYNC

Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/sync-main-to-dev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,9 @@ jobs:
git checkout -b $SYNC origin/$SYNC || git checkout -b $SYNC origin/$BASE
git merge origin/$HEAD -m "Merge $HEAD into $SYNC"
git checkout origin/$BASE src/
git checkout origin/$BASE -- tests/schema/ ':*.mjs'
# exclude mjs files because we want to sync from the head
# neutralizes non-zero exit code because an empty selection result returns 1
git checkout origin/$BASE -- tests/schema/ ':!*.mjs' || echo ""
Comment thread
baywet marked this conversation as resolved.
Comment thread
handrews marked this conversation as resolved.
git commit -m "Restored src/ and tests/schema/" || echo ""
git push -u origin $SYNC

Expand Down