Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upmerge GA #357

Merged
merged 1 commit into from
Dec 9, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
63 changes: 63 additions & 0 deletions .github/workflows/upmerge_pr.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
name: Upmerge PR

on:
schedule:
-
cron: "0 2 * * *"
workflow_dispatch: ~

permissions:
contents: write
pull-requests: write

jobs:
upmerge:
runs-on: ubuntu-latest
if: github.repository == 'Sylius/InvoicingPlugin'
name: "Upmerge PR"
timeout-minutes: 5
strategy:
fail-fast: false
matrix:
include:
-
base_branch: "1.0"
target_branch: "2.0"

steps:
-
uses: actions/checkout@v4
with:
ref: ${{ matrix.target_branch }}

-
name: Reset upmerge branch
run: |
git fetch origin ${{ matrix.base_branch }}:${{ matrix.base_branch }}
git reset --hard ${{ matrix.base_branch }}

-
name: Create Pull Request
uses: peter-evans/create-pull-request@v4
with:
token: ${{ secrets.SYLIUS_BOT_PAT }}
title: '[UPMERGE] ${{ matrix.base_branch }} -> ${{ matrix.target_branch }}'
body: |
This PR has been generated automatically.
For more details see [upmerge_pr.yaml](/Sylius/InvoicingPlugin/blob/1.0/.github/workflows/upmerge_pr.yaml).

**Remember!** The upmerge should always be merged with using `Merge pull request` button.

In case of conflicts, please resolve them manually with usign the following commands:
```
git fetch upstream
gh pr checkout <this-pr-number>
git merge upstream/${{ matrix.target_branch }} -m "Resolve conflicts between ${{ matrix.base_branch }} and ${{ matrix.target_branch }}"
```

If you use other name for the upstream remote, please replace `upstream` with the name of your remote pointing to the `Sylius/InvoicingPlugin` repository.

Once the conflicts are resolved, please run `git merge --continue` and push the changes to this PR.
branch: "upmerge/${{ matrix.base_branch }}_${{ matrix.target_branch }}"
delete-branch: true
base: ${{ matrix.target_branch }}
Loading