adapt workflow matrix to M4.4

learnweb · May 24, 2024 · 8d47e63 · 8d47e63
1 parent 8528555
commit 8d47e63
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 3 deletions.
diff --git a/.github/workflows/moodle-ci.yml b/.github/workflows/moodle-ci.yml
@@ -113,9 +113,27 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php: ['8.0', '8.1']
-        moodle-branch: ['MOODLE_401_STABLE', 'MOODLE_402_STABLE', 'MOODLE_403_STABLE']
-        database: ['mariadb', 'pgsql']
+        php: [ '8.0', '8.1', '8.2', '8.3' ]
+        moodle-branch: [ 'MOODLE_401_STABLE', 'MOODLE_402_STABLE', 'MOODLE_403_STABLE', 'MOODLE_404_STABLE' ]
+        database: [ 'mariadb', 'pgsql' ]
+        exclude:
+          - php: '8.0'
+            moodle-branch: 'MOODLE_404_STABLE'
+          - php: '8.2'
+            moodle-branch: 'MOODLE_401_STABLE'
+          - php: '8.3'
+            moodle-branch: 'MOODLE_401_STABLE'
+          - php: '8.3'
+            moodle-branch: 'MOODLE_402_STABLE'
+          - php: '8.3'
+            moodle-branch: 'MOODLE_403_STABLE'
+        include:
+          - php: '7.4'
+            moodle-branch: 'MOODLE_401_STABLE'
+            database: 'pgsql'
+          - php: '7.4'
+            moodle-branch: 'MOODLE_401_STABLE'
+            database: 'mariadb'
 
     steps:
       - name: Start MariaDB

diff --git a/classes/external.php b/classes/external.php
@@ -90,6 +90,7 @@ public static function record_usersettings($userid, $timefilterpast, $timefilter
                 'basicletter' => $basicletter, 'completionletter' => $completionletter, 'postletter' => $postletter,
             ]);
         } else {
+            // TODO: delete this branch when Moodle 4.1 is no longer supported.
             $params = [
                 'userid' => $userid, 'timefilterpast' => $timefilterpast, 'timefilterfuture' => $timefilterfuture,
                 'basicletter' => $basicletter, 'completionletter' => $completionletter, 'postletter' => $postletter, ];