Merge pull request #5493 from OAI/dev-sync-with-main

dev: sync with main

Author: handrews

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

@@ -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/
+            # 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 ""
             git commit -m "Restored src/ and tests/schema/" || echo ""
             git push -u origin $SYNC
 

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

@@ -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/
+          # 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 ""
           git commit -m "Restored src/ and tests/schema/" || echo ""
           git push -u origin $SYNC