-
Notifications
You must be signed in to change notification settings - Fork 83
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
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/2.0 -m "Resolve conflicts between 1.0 and 2.0" ``` 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.
- Loading branch information
Showing
8 changed files
with
70 additions
and
15 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 }} |
4 changes: 2 additions & 2 deletions
4
...onfig/routes/sylius_invoicing_plugin.yaml → config/routes.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,9 +1,9 @@ | ||
sylius_invoicing_admin: | ||
resource: "@SyliusInvoicingPlugin/config/admin_routes.yaml" | ||
resource: "@SyliusInvoicingPlugin/config/routes/admin.yaml" | ||
prefix: /admin | ||
|
||
sylius_invoicing_shop: | ||
resource: "@SyliusInvoicingPlugin/config/shop_routes.yaml" | ||
resource: "@SyliusInvoicingPlugin/config/routes/shop.yaml" | ||
prefix: /{_locale} | ||
requirements: | ||
_locale: ^[a-z]{2}(?:_[A-Z]{2})?$ |
File renamed without changes.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
sylius_invoicing: | ||
resource: "@SyliusInvoicingPlugin/config/routes.yaml" |