diff --git a/.forgejo/workflows/backport.yml b/.forgejo/workflows/backport.yml index de6e987ab2..50e8785c12 100644 --- a/.forgejo/workflows/backport.yml +++ b/.forgejo/workflows/backport.yml @@ -77,9 +77,11 @@ jobs: echo "target-branch: ${{ fromJSON(steps.extract-targets.outputs.targets)[0] }}" echo "pull-request: ${{ github.event.pull_request.url }}" - - uses: https://code.forgejo.org/actions/git-backporting@v4.5.2 + - uses: https://code.forgejo.org/actions/git-backporting@v4.6.0 with: target-branch: ${{ fromJSON(steps.extract-targets.outputs.targets)[0] }}/forgejo + strategy: ort + strategy-option: find-renames no-squash: true auth: ${{ secrets.BACKPORT_TOKEN }} pull-request: ${{ github.event.pull_request.url }}