From 03b0d48436df82e82eb7de8f6f84f6641e4ea0e2 Mon Sep 17 00:00:00 2001 From: Johan Cwiklinski Date: Fri, 10 Jul 2020 08:49:15 +0200 Subject: [PATCH] Back to mariadb 10.3, there is something wrong with 10.5 and 10.4 (#7639) refs #7640 --- .circleci/config.yml | 4 ++-- .github/workflows/ci.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 9b912ac35d9..19c5eab66f7 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -11,11 +11,11 @@ executors: php_7_3_mariadb: docker: - image: glpi/circleci-env-core:php_7.3_fpm-node - - image: circleci/mariadb:10.5-ram + - image: circleci/mariadb:10.3-ram php_7_4_mariadb: docker: - image: glpi/circleci-env-core:php_7.4_fpm-node - - image: circleci/mariadb:10.5-ram + - image: circleci/mariadb:10.3-ram php_7_4_mysql_5_6: docker: - image: glpi/circleci-env-core:php_7.4_fpm-node diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5ae63678be8..4a03a155ef7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -63,7 +63,7 @@ jobs: include: - {php-version: "7.2", db-image: "mariadb:10.1"} - {php-version: "7.2", db-image: "mysql:5.6"} - - {php-version: "7.4", db-image: "mariadb:10.5"} + - {php-version: "7.4", db-image: "mariadb:10.3"} - {php-version: "7.4", db-image: "mysql:8.0"} services: app: