From 2deaf1c2b9ed7043bccd24f31aff39d6f6d22336 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Pysiak?= <mpysiak@gmail.com>
Date: Mon, 9 Dec 2024 06:58:15 +0100
Subject: [PATCH] Upmerge GA

---
 .github/workflows/upmerge_pr.yaml | 63 +++++++++++++++++++++++++++++++
 1 file changed, 63 insertions(+)
 create mode 100644 .github/workflows/upmerge_pr.yaml

diff --git a/.github/workflows/upmerge_pr.yaml b/.github/workflows/upmerge_pr.yaml
new file mode 100644
index 00000000..f7082033
--- /dev/null
+++ b/.github/workflows/upmerge_pr.yaml
@@ -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 }}