Skip to content

Commit 05deec4

Browse files
committed
Use SyliusLabs/UpmergeAction for automated upmerge
1 parent 07f499a commit 05deec4

File tree

1 file changed

+4
-29
lines changed

1 file changed

+4
-29
lines changed

.github/workflows/upmerge_pr.yaml

Lines changed: 4 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -37,33 +37,8 @@ jobs:
3737
ref: ${{ matrix.target_branch }}
3838

3939
-
40-
name: Reset upmerge branch
41-
run: |
42-
git fetch origin ${{ matrix.base_branch }}:${{ matrix.base_branch }}
43-
git reset --hard ${{ matrix.base_branch }}
44-
45-
-
46-
name: Create Pull Request
47-
uses: peter-evans/create-pull-request@v4
40+
uses: SyliusLabs/UpmergeAction@v1
4841
with:
49-
token: ${{ secrets.SYLIUS_BOT_PAT }}
50-
title: '[UPMERGE] ${{ matrix.base_branch }} -> ${{ matrix.target_branch }}'
51-
body: |
52-
This PR has been generated automatically.
53-
For more details see [upmerge_pr.yaml](/Sylius/PayPalPlugin/blob/1.7/.github/workflows/upmerge_pr.yaml).
54-
55-
**Remember!** The upmerge should always be merged with using `Merge pull request` button.
56-
57-
In case of conflicts, please resolve them manually with usign the following commands:
58-
```
59-
git fetch upstream
60-
gh pr checkout <this-pr-number>
61-
git merge upstream/${{ matrix.target_branch }} -m "Resolve conflicts between ${{ matrix.base_branch }} and ${{ matrix.target_branch }}"
62-
```
63-
64-
If you use other name for the upstream remote, please replace `upstream` with the name of your remote pointing to the `Sylius/PayPalPlugin` repository.
65-
66-
Once the conflicts are resolved, please run `git merge --continue` and push the changes to this PR.
67-
branch: "upmerge/${{ matrix.base_branch }}_${{ matrix.target_branch }}"
68-
delete-branch: true
69-
base: ${{ matrix.target_branch }}
42+
base_branch: ${{ matrix.base_branch }}
43+
target_branch: ${{ matrix.target_branch }}
44+
token: ${{ secrets.GITHUB_TOKEN }}

0 commit comments

Comments
 (0)