Merge pull request #4 from tetrateio/fix_sync

fix: attempt to fix sync-upstream job.

Author: M4tteoP

.github/workflows/sync-upstream.yaml

@@ -12,14 +12,14 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout target repo
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           ref: main
           token: ${{ secrets.SYNC_TOKEN }}
       - name: Sync upstream changes
-        uses: aormsby/[email protected]
+        uses: aormsby/[email protected].1
         with:
           target_sync_branch: main
           upstream_sync_branch: main
-          upstream_pull_args: '--allow-unrelated-histories'
+          upstream_pull_args: '-s recursive -Xtheirs --allow-unrelated-histories'
           upstream_sync_repo: corazawaf/coraza-proxy-wasm