From f997eb66fc3bb51f139ef3139fa399667dae177c Mon Sep 17 00:00:00 2001 From: Tatyana Koleva Date: Thu, 3 Oct 2024 18:34:12 +0300 Subject: [PATCH] OXDEV-8009 Add mariadb11 to the workflow options and update composer --- .github/workflows/dispatch_module.yaml | 4 ++++ composer.json | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/dispatch_module.yaml b/.github/workflows/dispatch_module.yaml index 94d7218..1dabba3 100644 --- a/.github/workflows/dispatch_module.yaml +++ b/.github/workflows/dispatch_module.yaml @@ -9,8 +9,10 @@ on: - 'no' - 'PHP8.2/MySQL5.7' - 'PHP8.2/MySQL8.0' + - 'PHP8.2/MariaDb11' - 'PHP8.3/MySQL5.7' - 'PHP8.3/MySQL8.0' + - 'PHP8.3/MariaDb11' default: 'PHP8.2/MySQL5.7' description: 'Limit to one PHP/MySQL combination' @@ -29,8 +31,10 @@ jobs: "no") LIMIT='';; "PHP8.2/MySQL5.7") LIMIT='~/defaults/php8.2_mysql5.7_only.yaml,' ;; "PHP8.2/MySQL8.0") LIMIT='~/defaults/php8.2_mysql8.0_only.yaml,' ;; + "PHP8.2/MariaDb11") LIMIT='~/defaults/php8.2_mariadb11_only.yaml,' ;; "PHP8.3/MySQL5.7") LIMIT='~/defaults/php8.3_mysql5.7_only.yaml,' ;; "PHP8.3/MySQL8.0") LIMIT='~/defaults/php8.3_mysql8.0_only.yaml,' ;; + "PHP8.3/MariaDb11") LIMIT='~/defaults/php8.3_mariadb11_only.yaml,' ;; *) echo "Illegal choice, fix the workflow" exit 1 ;; diff --git a/composer.json b/composer.json index 0192b0d..a3671c1 100644 --- a/composer.json +++ b/composer.json @@ -18,12 +18,12 @@ ], "license": ["proprietary"], "require": { - "php": "^8.1", + "php": "^8.2", "doctrine/dbal": "^v2.7", "oxid-esales/graphql-base": "dev-b-7.2.x" }, "conflict": { - "oxid-esales/oxideshop-ce": "<7.1", + "oxid-esales/oxideshop-ce": "<7.2", "oxid-esales/graphql-catalogue": "*", "oxid-esales/graphql-account": "*", "oxid-esales/graphql-checkout": "*"