finn/forgejo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[CI] backport auto-squash detection and -x

Browse source 
* Behaves as it should with merge & squashed pull requests
* Cherry-pick commits with -x for traceability

Refs: https://github.com/kiegroup/git-backporting/issues/113
This commit is contained in:
Earl Warren 2024-04-03 07:30:42 +02:00
parent 59bb7c2bf0
commit 6c7179355e
No known key found for this signature in database
GPG key ID: 0579CB2928A78A00
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.forgejo/workflows/backport.yml
View file

@ -73,11 +73,11 @@ jobs:
echo "target-branch: ${{ fromJSON(steps.extract-targets.outputs.targets)[0] }}" echo "target-branch: ${{ fromJSON(steps.extract-targets.outputs.targets)[0] }}"
echo "pull-request: ${{ github.event.pull_request.url }}" 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: with:
target-branch: ${{ fromJSON(steps.extract-targets.outputs.targets)[0] }}/forgejo target-branch: ${{ fromJSON(steps.extract-targets.outputs.targets)[0] }}/forgejo
strategy: ort strategy: ort
strategy-option: find-renames strategy-option: find-renames
no-squash: true cherry-pick-options: -x
auth: ${{ secrets.BACKPORT_TOKEN }} auth: ${{ secrets.BACKPORT_TOKEN }}
pull-request: ${{ github.event.pull_request.url }} pull-request: ${{ github.event.pull_request.url }}