Skip to content

Commit

Permalink
[CI] backport auto-squash detection and -x
Browse files Browse the repository at this point in the history
* Behaves as it should with merge & squashed pull requests
* Cherry-pick commits with -x for traceability

Refs: kiegroup/git-backporting#113
  • Loading branch information
earl-warren committed Apr 3, 2024
1 parent 59bb7c2 commit 6c71793
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions .forgejo/workflows/backport.yml
Original file line number Diff line number Diff line change
Expand Up @@ -73,11 +73,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/forgejo/git-backporting@9770e517502d6560993bea13bbea316ffcf71f49
- uses: https://code.forgejo.org/forgejo/git-backporting@b2554a678d5ea2814f0df3abad2ac4fcdee2d81f
with:
target-branch: ${{ fromJSON(steps.extract-targets.outputs.targets)[0] }}/forgejo
strategy: ort
strategy-option: find-renames
no-squash: true
cherry-pick-options: -x
auth: ${{ secrets.BACKPORT_TOKEN }}
pull-request: ${{ github.event.pull_request.url }}

0 comments on commit 6c71793

Please sign in to comment.