Skip to content

Commit 785af56

Browse files
committed
fix(db): add support for MariaDB 12.3 LTS and increase min. to 10.11
10.6 will be EOL when Nextcloud 35 is released, similar to 10.3 its still somewhat supported for enterprise Ubuntu 22.04. So as we dropped 20.04 support we can increase that exception to 10.6. Now MariaDB is supported with active LTS version 10.11 to 12.3 (new LTS). Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
1 parent b54e98a commit 785af56

2 files changed

Lines changed: 6 additions & 6 deletions

File tree

.github/workflows/phpunit-mariadb.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,9 @@ jobs:
6060
fail-fast: false
6161
matrix:
6262
include:
63-
- mariadb-versions: '10.6'
63+
- mariadb-versions: '10.11'
6464
php-versions: '8.3'
65-
- mariadb-versions: '11.8'
65+
- mariadb-versions: '12.3'
6666
php-versions: '8.5'
6767

6868
name: MariaDB ${{ matrix.mariadb-versions }} (PHP ${{ matrix.php-versions }}) - database tests

apps/settings/lib/SetupChecks/SupportedDatabase.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717

1818
class SupportedDatabase implements ISetupCheck {
1919

20-
private const MIN_MARIADB = '10.6';
21-
private const MAX_MARIADB = '11.8';
20+
private const MIN_MARIADB = '10.11';
21+
private const MAX_MARIADB = '12.3';
2222
private const MIN_MYSQL = '8.4';
2323
private const MAX_MYSQL = '9.7';
2424
private const MIN_POSTGRES = '14';
@@ -56,10 +56,10 @@ public function run(): SetupResult {
5656
[$major, $minor, ] = explode('.', $versionlc);
5757
$versionConcern = $major . '.' . $minor;
5858
if (str_contains($versionlc, 'mariadb')) {
59-
if (version_compare($versionConcern, '10.3', '=')) {
59+
if (version_compare($versionConcern, '10.6', '=')) {
6060
return SetupResult::info(
6161
$this->l10n->t(
62-
'MariaDB version 10.3 detected, this version is end-of-life and only supported as part of Ubuntu 20.04. MariaDB >=%1$s and <=%2$s is suggested for best performance, stability and functionality with this version of Nextcloud.',
62+
'MariaDB version 10.6 detected, this version is end-of-life and only supported as part of Ubuntu 22.04. MariaDB >=%1$s and <=%2$s is suggested for best performance, stability and functionality with this version of Nextcloud.',
6363
[
6464
self::MIN_MARIADB,
6565
self::MAX_MARIADB,

0 commit comments

Comments
 (0)