Merge branch '1.0' into 2.0

* 1.0: [Maintenance] Bump wkhtmltopdf version Fix installation guide routes importing step
Sylius · Jan 10, 2025 · 814f964 · 814f964
2 parents 0167a79 + 7474af5
commit 814f964
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -26,7 +26,7 @@ jobs:
                 database: ["mysql", "postgres"]
                 mysql: ["8.4"]
                 postgres: ["15.8"]
-                wkhtmltopdf: ["0.12.6-1", false]
+                wkhtmltopdf: ["0.12.6.1-2", false]
                 state_machine_adapter: ["symfony_workflow"]
 
                 include:
@@ -37,7 +37,7 @@ jobs:
                         node: "20.x"
                         database: "mysql"
                         mysql: "8.4"
-                        wkhtmltopdf: "0.12.6-1"
+                        wkhtmltopdf: "0.12.6.1-2"
                         state_machine_adapter: "winzou_state_machine"
 
         env:
@@ -100,8 +100,8 @@ jobs:
                 if: matrix.wkhtmltopdf != false && steps.cache-wkhtmltopdf.outputs.cache-hit != 'true'
                 run: |
                     sudo apt-get install -y xfonts-base xfonts-75dpi
-                    wget https://github.com/wkhtmltopdf/packaging/releases/download/${{ matrix.wkhtmltopdf }}/wkhtmltox_${{ matrix.wkhtmltopdf }}.focal_amd64.deb
-                    sudo dpkg -i wkhtmltox_${{ matrix.wkhtmltopdf }}.focal_amd64.deb
+                    wget https://github.com/wkhtmltopdf/packaging/releases/download/${{ matrix.wkhtmltopdf }}/wkhtmltox_${{ matrix.wkhtmltopdf }}.jammy_amd64.deb
+                    sudo dpkg -i wkhtmltox_${{ matrix.wkhtmltopdf }}.jammy_amd64.deb
 
             -
                 name: Disable PDF generation

diff --git a/README.md b/README.md
@@ -32,6 +32,12 @@ Additional feature of the plugin that fulfills Invoicing domain is the ability t
 
 ## Installation
 
+#### Beware!
+
+This installation instruction assumes that you're using Symfony Flex. If you don't, take a look at the
+[legacy installation instruction](docs/legacy_installation.md). However, we strongly encourage you to use
+Symfony Flex, it's much quicker!
+
 1. Require plugin with composer:
 
     ```bash
@@ -69,12 +75,6 @@ Additional feature of the plugin that fulfills Invoicing domain is the ability t
    bin/console sylius-invoicing:generate-invoices
    ```
 
-#### Beware!
-
-This installation instruction assumes that you're using Symfony Flex. If you don't, take a look at the
-[legacy installation instruction](docs/legacy_installation.md). However, we strongly encourage you to use
-Symfony Flex, it's much quicker! :)
-
 ## Extension points
 
 The majority of actions contained in the SyliusInvoicingPlugin are executed after an event related to the change of the Order’s state.

diff --git a/docs/legacy_installation.md b/docs/legacy_installation.md
@@ -25,7 +25,7 @@
 1. Import routes:
 
     ```yaml
-    sylius_refund:
+    sylius_invoicing:
         resource: "@SyliusInvoicingPlugin/config/routes.yaml"
     ```