Skip to content

Commit 7e1c05e

Browse files
committed
Use SyliusLabs/UpmergeAction for upmerge workflow
1 parent cf0ca85 commit 7e1c05e

File tree

1 file changed

+3
-28
lines changed

1 file changed

+3
-28
lines changed

.github/workflows/upmerge_pr.yaml

Lines changed: 3 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -34,33 +34,8 @@ jobs:
3434
ref: ${{ matrix.target_branch }}
3535

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

0 commit comments

Comments
 (0)