Merge pull request #4 from tetrateio/fix_sync

fix: attempt to fix sync-upstream job.
tetrateio · Jul 20, 2024 · e0b036d · e0b036d
2 parents 5313082 + f81ae07
commit e0b036d
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/.github/workflows/sync-upstream.yaml b/.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