aboutsummaryrefslogtreecommitdiffstats
path: root/.github
diff options
context:
space:
mode:
authorFerdinand Thiessen <opensource@fthiessen.de>2024-06-25 22:37:21 +0200
committerFerdinand Thiessen <opensource@fthiessen.de>2024-06-27 16:15:16 +0200
commitd5d180daf633a085b1e27f7ff3fe0f038fa321de (patch)
treeb7aa52749e71251f1a6f371d3bb1716c9881403b /.github
parent00aa8f543841c6bfd853a3ac5cb4ff3ab0a058ae (diff)
downloadnextcloud-server-d5d180daf633a085b1e27f7ff3fe0f038fa321de.tar.gz
nextcloud-server-d5d180daf633a085b1e27f7ff3fe0f038fa321de.zip
ci: Adjust database versions to current LTS / supported versions
* MySQL tests * Minimum 8.0 (LTS) * Maximum 8.4 (LTS) * Drop 8.3 as we now test 8.4 and 8.3 was never LTS * MariaDB tests * still supported version 10.3 (no LTS but for Ubuntu 20.04 support) * LTS 10.6 * LTS 10.11 * LTS 11.4 * Drop 10.5 is was never LTS and we test 10.3 and 10.6 Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
Diffstat (limited to '.github')
-rw-r--r--.github/workflows/phpunit-mariadb.yml6
-rw-r--r--.github/workflows/phpunit-mysql.yml2
2 files changed, 4 insertions, 4 deletions
diff --git a/.github/workflows/phpunit-mariadb.yml b/.github/workflows/phpunit-mariadb.yml
index b9c66256941..27ccb4de2bd 100644
--- 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
index f0d318c8c3b..b4eb3fcd958 100644
--- 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'