From 1ce5437efa590f34b373111bb68d250c0de352bc Mon Sep 17 00:00:00 2001
From: Stephan Robotta <stephan.robotta@bfh.ch>
Date: Fri, 6 Dec 2024 20:52:03 +0100
Subject: [PATCH] Adapt ci pipeline to 5.0dev requirements.

---
 .github/workflows/moodle-plugin-ci.yml | 77 +++++---------------------
 1 file changed, 13 insertions(+), 64 deletions(-)

diff --git a/.github/workflows/moodle-plugin-ci.yml b/.github/workflows/moodle-plugin-ci.yml
index c7ca7c3..db41586 100644
--- a/.github/workflows/moodle-plugin-ci.yml
+++ b/.github/workflows/moodle-plugin-ci.yml
@@ -8,7 +8,7 @@ jobs:
 
     services:
       postgres:
-        image: postgres:13
+        image: postgres:14
         env:
           POSTGRES_USER: 'postgres'
           POSTGRES_HOST_AUTH_METHOD: 'trust'
@@ -16,15 +16,21 @@ jobs:
           - 5432:5432
         options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 3
       mariadb:
-        image: mariadb:10.6
+        image: mariadb:11.4
         env:
-          MYSQL_USER: 'root'
-          MYSQL_ALLOW_EMPTY_PASSWORD: "true"
-          MYSQL_CHARACTER_SET_SERVER: "utf8mb4"
-          MYSQL_COLLATION_SERVER: "utf8mb4_unicode_ci"
+          MARIADB_USER: 'root'
+          MARIADB_ALLOW_EMPTY_ROOT_PASSWORD: '1'
+          MARIADB_CHARACTER_SET_SERVER: "utf8mb4"
+          MARIADB_COLLATION_SERVER: "utf8mb4_unicode_ci"
         ports:
           - 3306:3306
-        options: --health-cmd="mysqladmin ping" --health-interval 10s --health-timeout 5s --health-retries 3
+        healthcheck:
+          test: [ "CMD", "healthcheck.sh", "--su-mysql", "--connect", "--innodb_initialized" ]
+          start_period: 1m
+          start_interval: 10s
+          interval: 1m
+          timeout: 5s
+          retries: 3
 
     strategy:
       fail-fast: false
@@ -46,62 +52,6 @@ jobs:
             moodle-branch: main
             database: mariadb
             plugin-ci: ^4
-          - php: 8.1
-            moodle-branch: main
-            database: pgsql
-            plugin-ci: ^4
-          - php: 8.1
-            moodle-branch: main
-            database: mariadb
-            plugin-ci: ^4
-          - php: 8.3
-            moodle-branch: MOODLE_405_STABLE
-            database: pgsql
-            plugin-ci: ^4
-          - php: 8.3
-            moodle-branch: MOODLE_405_STABLE
-            database: mariadb
-            plugin-ci: ^4
-          - php: 8.2
-            moodle-branch: MOODLE_405_STABLE
-            database: pgsql
-            plugin-ci: ^4
-          - php: 8.2
-            moodle-branch: MOODLE_405_STABLE
-            database: mariadb
-            plugin-ci: ^4
-          - php: 8.1
-            moodle-branch: MOODLE_405_STABLE
-            database: pgsql
-            plugin-ci: ^4
-          - php: 8.1
-            moodle-branch: MOODLE_405_STABLE
-            database: mariadb
-            plugin-ci: ^4
-          - php: 8.3
-            moodle-branch: MOODLE_404_STABLE
-            database: pgsql
-            plugin-ci: ^4
-          - php: 8.3
-            moodle-branch: MOODLE_404_STABLE
-            database: mariadb
-            plugin-ci: ^4
-          - php: 8.2
-            moodle-branch: MOODLE_404_STABLE
-            database: pgsql
-            plugin-ci: ^4
-          - php: 8.2
-            moodle-branch: MOODLE_404_STABLE
-            database: mariadb
-            plugin-ci: ^4
-          - php: 8.1
-            moodle-branch: MOODLE_404_STABLE
-            database: pgsql
-            plugin-ci: ^4
-          - php: 8.1
-            moodle-branch: MOODLE_404_STABLE
-            database: mariadb
-            plugin-ci: ^4
 
     steps:
       - name: Check out repository code
@@ -113,7 +63,6 @@ jobs:
         uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php }}
-          extensions: ${{ matrix.extensions }}
           ini-values: max_input_vars=5000
           coverage: none