Merge pull request #46121 from nextcloud/fix/database-versions

ci: Adjust database versions to current LTS / supported versions
nextcloud · Jun 28, 2024 · b901a62 · b901a62
2 parents 8ec5360 + 6601adc
commit b901a62
Show file tree

Hide file tree

Showing 4 changed files with 47 additions and 13 deletions.
diff --git a/.github/workflows/phpunit-mariadb.yml b/.github/workflows/phpunit-mariadb.yml
@@ -56,10 +56,10 @@ jobs:
     strategy:
       matrix:
         php-versions: ['8.1']
-        mariadb-versions: ['10.3', '10.5', '10.6', '10.11']
+        mariadb-versions: ['10.3', '10.6', '10.11', '11.4']
         include:
           - php-versions: '8.3'
-            mariadb-versions: '10.6'
+            mariadb-versions: '10.11'
             coverage: ${{ github.event_name != 'pull_request' }}
 
     name: MariaDB ${{ matrix.mariadb-versions }} (PHP ${{ matrix.php-versions }}) - database tests
@@ -80,7 +80,7 @@ jobs:
           MYSQL_USER: oc_autotest
           MYSQL_PASSWORD: nextcloud
           MYSQL_DATABASE: oc_autotest
-        options: --health-cmd="mysqladmin ping" --health-interval 5s --health-timeout 2s --health-retries 5
+        options: --health-cmd="${{ matrix.mariadb-versions <= 10.4 && 'mysqladmin' || 'mariadb-admin'}} ping" --health-interval 5s --health-timeout 2s --health-retries 5
 
     steps:
       - name: Checkout server

diff --git a/.github/workflows/phpunit-mysql.yml b/.github/workflows/phpunit-mysql.yml
@@ -56,7 +56,7 @@ jobs:
     strategy:
       matrix:
         php-versions: ['8.1']
-        mysql-versions: ['8.0', '8.3']
+        mysql-versions: ['8.0', '8.4']
         include:
           - mysql-versions: '8.0'
             php-versions: '8.3'

diff --git a/apps/settings/lib/SetupChecks/SupportedDatabase.php b/apps/settings/lib/SetupChecks/SupportedDatabase.php
@@ -19,6 +19,12 @@
 use OCP\SetupCheck\SetupResult;
 
 class SupportedDatabase implements ISetupCheck {
+
+	private const MIN_MARIADB = '10.6';
+	private const MAX_MARIADB = '11.4';
+	private const MIN_MYSQL = '8.0';
+	private const MAX_MYSQL = '8.4';
+
 	public function __construct(
 		private IL10N $l10n,
 		private IURLGenerator $urlGenerator,
@@ -38,26 +44,54 @@ public function run(): SetupResult {
 		$version = null;
 		$databasePlatform = $this->connection->getDatabasePlatform();
 		if ($databasePlatform instanceof MySQLPlatform) {
-			$result = $this->connection->prepare("SHOW VARIABLES LIKE 'version';");
-			$result->execute();
+			$statement = $this->connection->prepare("SHOW VARIABLES LIKE 'version';");
+			$result = $statement->execute();
 			$row = $result->fetch();
 			$version = $row['Value'];
 			$versionlc = strtolower($version);
 			// we only care about X.Y not X.Y.Z differences
 			[$major, $minor, ] = explode('.', $versionlc);
 			$versionConcern = $major . '.' . $minor;
 			if (str_contains($versionlc, 'mariadb')) {
-				if (version_compare($versionConcern, '10.3', '<') || version_compare($versionConcern, '10.11', '>')) {
-					return SetupResult::warning($this->l10n->t('MariaDB version "%s" detected. MariaDB >=10.3 and <=10.11 is suggested for best performance, stability and functionality with this version of Nextcloud.', $version));
+				if (version_compare($versionConcern, '10.3', '=')) {
+					return SetupResult::info(
+						$this->l10n->t(
+							'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.',
+							[
+								self::MIN_MARIADB,
+								self::MAX_MARIADB,
+							]
+						),
+					);
+				} elseif (version_compare($versionConcern, self::MIN_MARIADB, '<') || version_compare($versionConcern, self::MAX_MARIADB, '>')) {
+					return SetupResult::warning(
+						$this->l10n->t(
+							'MariaDB version "%1$s" detected. MariaDB >=%2$s and <=%3$s is suggested for best performance, stability and functionality with this version of Nextcloud.',
+							[
+								$version,
+								self::MIN_MARIADB,
+								self::MAX_MARIADB,
+							],
+						),
+					);
 				}
 			} else {
-				if (version_compare($versionConcern, '8.0', '<') || version_compare($versionConcern, '8.3', '>')) {
-					return SetupResult::warning($this->l10n->t('MySQL version "%s" detected. MySQL >=8.0 and <=8.3 is suggested for best performance, stability and functionality with this version of Nextcloud.', $version));
+				if (version_compare($versionConcern, self::MIN_MYSQL, '<') || version_compare($versionConcern, self::MAX_MYSQL, '>')) {
+					return SetupResult::warning(
+						$this->l10n->t(
+							'MySQL version "%1$s" detected. MySQL >=%2$s and <=%3$s is suggested for best performance, stability and functionality with this version of Nextcloud.',
+							[
+								$version,
+								self::MIN_MYSQL,
+								self::MAX_MYSQL,
+							],
+						),
+					);
 				}
 			}
 		} elseif ($databasePlatform instanceof PostgreSQLPlatform) {
-			$result = $this->connection->prepare('SHOW server_version;');
-			$result->execute();
+			$statement = $this->connection->prepare('SHOW server_version;');
+			$result = $statement->execute();
 			$row = $result->fetch();
 			$version = $row['server_version'];
 			$versionlc = strtolower($version);

diff --git a/apps/settings/tests/SetupChecks/SupportedDatabaseTest.php b/apps/settings/tests/SetupChecks/SupportedDatabaseTest.php
@@ -46,7 +46,7 @@ public function testPass(): void {
 			/** SQlite always gets a warning */
 			$this->assertEquals(SetupResult::WARNING, $this->check->run()->getSeverity());
 		} else {
-			$this->assertEquals(SetupResult::SUCCESS, $this->check->run()->getSeverity());
+			$this->assertContains($this->check->run()->getSeverity(), [SetupResult::SUCCESS, SetupResult::INFO]);
 		}
 	}
 }