Skip to content

Commit

Permalink
[UPMERGE] 1.0 -> 2.0 (#360)
Browse files Browse the repository at this point in the history
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
Rafikooo authored Dec 11, 2024
2 parents 033dc4f + 028199d commit 0167a79
Show file tree
Hide file tree
Showing 8 changed files with 70 additions and 15 deletions.
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 }}
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.
13 changes: 3 additions & 10 deletions docs/legacy_installation.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,18 +22,11 @@
- { resource: '@SyliusInvoicingPlugin/config/config.yaml' }
```
1. Import routing:
1. Import routes:
```yaml
sylius_invoicing_admin:
resource: '@SyliusInvoicingPlugin/config/admin_routes.yaml'
prefix: '/%sylius_admin.path_name%'
sylius_invoicing_shop:
resource: '@SyliusInvoicingPlugin/config/shop_routes.yaml'
prefix: /{_locale}
requirements:
_locale: ^[a-z]{2}(?:_[A-Z]{2})?$
sylius_refund:
resource: "@SyliusInvoicingPlugin/config/routes.yaml"
```
1. Check if you have `wkhtmltopdf` binary. If not, you can download it [here](https://wkhtmltopdf.org/downloads.html).
Expand Down
1 change: 0 additions & 1 deletion src/SyliusInvoicingPlugin.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
use Sylius\Bundle\CoreBundle\Application\SyliusPluginTrait;
use Symfony\Component\HttpKernel\Bundle\Bundle;

/** @internal */
final class SyliusInvoicingPlugin extends Bundle
{
use SyliusPluginTrait;
Expand Down
2 changes: 0 additions & 2 deletions tests/Application/config/packages/sylius_invoicing.yaml

This file was deleted.

2 changes: 2 additions & 0 deletions tests/Application/config/routes.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
sylius_invoicing:
resource: "@SyliusInvoicingPlugin/config/routes.yaml"

0 comments on commit 0167a79

Please sign in to comment.