mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2024-11-10 12:15:43 +01:00
Merge pull request '[CI] backport strategy must fail when it conflicts' (#2896) from earl-warren/forgejo:wip-ci-backport into forgejo
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/2896
This commit is contained in:
commit
053ab13f99
1 changed files with 3 additions and 1 deletions
|
@ -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 }}
|
||||
|
|
Loading…
Reference in a new issue