Merge branch 'b-7.3.x' into b-8.0.x

OXID-eSales · Oct 24, 2024 · c6291bb · c6291bb
2 parents bb76a6c + 5e42e92
commit c6291bb
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/.github/oxid-esales/shop_ce.yaml b/.github/oxid-esales/shop_ce.yaml
@@ -19,8 +19,7 @@ install: &install
           "require": {
             "oxid-esales/twig-component": "{{ .Data.global.composer.dev_ref }}",
             "oxid-esales/twig-admin-theme": "{{ .Data.global.composer.dev_ref }}",
-            "oxid-esales/apex-theme": "{{ .Data.global.composer.dev_ref }}",
-            "twig/twig": "^3.14"
+            "oxid-esales/apex-theme": "{{ .Data.global.composer.dev_ref }}"
           }
       }
   output:

diff --git a/.github/workflows/dispatch_shop_ce.yaml b/.github/workflows/dispatch_shop_ce.yaml
@@ -26,7 +26,7 @@ on:
           - 'PHP8.2/MySQL8.0'
           - 'PHP8.3/MySQL5.7'
           - 'PHP8.3/MySQL8.0'
-        default: 'PHP8.1/MySQL5.7'
+        default: 'PHP8.3/MySQL8.0'
       custom_testplan:
         type: string
         description: 'Custom testplan'