WP-4740 Added testing on Workplace and LMS 4.4

.github/workflows/moodle-ci.yml

@@ -52,6 +52,10 @@ jobs:
           - php: '8.2'
             moodle-branch: 'MOODLE_403_STABLE'
             database: pgsql
+          - php: '8.3'
+            moodle-branch: 'main' # TODO WPOS-92 replace with MOODLE_404_STABLE when it is created
+            database: pgsql
+            extensions: xmlrpc-beta
 
     steps:
       - name: Check out repository code

.gitlab-ci.yml

@@ -8,6 +8,7 @@ services:
 
 variables:
   MOODLE_REPO_WORKPLACE: [email protected]:workplace/workplacedev.git
+  MOODLE_BRANCH_WORKPLACE404R: WORKPLACE_ROLLING_404
   MOODLE_BRANCH_WORKPLACE403R: WORKPLACE_ROLLING_403
   MOODLE_BRANCH_WORKPLACE403S: WORKPLACE_403
   MOODLE_BRANCH_WORKPLACE402R: WORKPLACE_ROLLING_402
@@ -19,6 +20,7 @@ variables:
   MOODLE_BRANCH_LMS401: MOODLE_401_STABLE
   MOODLE_BRANCH_LMS402: MOODLE_402_STABLE
   MOODLE_BRANCH_LMS403: MOODLE_403_STABLE
+  MOODLE_BRANCH_LMS404: main # TODO WPOS-92 replace with MOODLE_404_STABLE when it is created
   MOODLE_BEHAT_WDHOST: "http://selenium-standalone-chrome:4444/wd/hub"
   POSTGRES_USER: postgres
   POSTGRES_PASSWORD: ""
@@ -31,25 +33,26 @@ variables:
 .setupworkplace: &setupworkplace
   before_script:
   - export MOODLE_REPO=$MOODLE_REPO_WORKPLACE
-  - export MOODLE_BRANCH=$MOODLE_BRANCH_WORKPLACE403R
+  - export MOODLE_BRANCH=$MOODLE_BRANCH_WORKPLACE404R
   - . prepare-workplace $cibot_sshkey
   - export PLUGINNAME=$(grep 'plugin->component' $CI_PROJECT_DIR/version.php | awk -F\' '{ print $2; }')
   - cd $CI_PROJECT_DIR/..
-  - moodle-plugin-ci add-plugin --clone [email protected]:workplace/moodle-theme_workplace.git
-  - moodle-plugin-ci add-plugin --clone [email protected]:workplace/moodle-tool_tenant.git
-  - moodle-plugin-ci add-plugin --clone [email protected]:workplace/moodle-tool_wp.git
-  - moodle-plugin-ci add-plugin --clone [email protected]:workplace/moodle-tool_dynamicrule.git
-  - moodle-plugin-ci add-plugin --clone [email protected]:workplace/moodle-tool_program.git
-  - moodle-plugin-ci add-plugin --clone [email protected]:workplace/moodle-tool_reportbuilder.git
-  - moodle-plugin-ci add-plugin --clone [email protected]:workplace/moodle-enrol_program.git
-  - moodle-plugin-ci add-plugin --clone [email protected]:workplace/moodle-tool_certification.git
-  - moodle-plugin-ci add-plugin --clone [email protected]:workplace/moodle-tool_organisation.git
-  - moodle-plugin-ci add-plugin --clone [email protected]:workplace/moodle-tool_custompage.git
-  - moodle-plugin-ci add-plugin --clone [email protected]:workplace/moodle-block_myteams.git
+  - moodle-plugin-ci add-plugin --clone [email protected]:workplace/moodle-theme_workplace.git --branch WP-4740
+  - moodle-plugin-ci add-plugin --clone [email protected]:workplace/moodle-tool_tenant.git --branch WP-4740
+  - moodle-plugin-ci add-plugin --clone [email protected]:workplace/moodle-tool_wp.git --branch WP-4740
+  - moodle-plugin-ci add-plugin --clone [email protected]:workplace/moodle-tool_dynamicrule.git --branch WP-4740
+  - moodle-plugin-ci add-plugin --clone [email protected]:workplace/moodle-tool_program.git --branch WP-4740
+  - moodle-plugin-ci add-plugin --clone [email protected]:workplace/moodle-tool_reportbuilder.git --branch WP-4740
+  - moodle-plugin-ci add-plugin --clone [email protected]:workplace/moodle-enrol_program.git --branch WP-4740
+  - moodle-plugin-ci add-plugin --clone [email protected]:workplace/moodle-tool_certification.git --branch WP-4740
+  - moodle-plugin-ci add-plugin --clone [email protected]:workplace/moodle-tool_organisation.git --branch WP-4740
+  - moodle-plugin-ci add-plugin --clone [email protected]:workplace/moodle-tool_custompage.git --branch WP-4740
+  - moodle-plugin-ci add-plugin --clone [email protected]:workplace/moodle-block_myteams.git --branch WP-4740
   - moodle-plugin-ci install --db-host="$DB_HOST" --no-init -vvv
   - cd moodle
 
 codecheck:
+  image: moodlehq/moodle-workplace-plugin-ci:8.1
   <<: *setupworkplace
   script:
   - php admin/tool/phpunit/cli/init.php
@@ -78,6 +81,7 @@ codecheck:
   - tags
 
 behat:
+  image: moodlehq/moodle-workplace-plugin-ci:8.1
   <<: *setupworkplace
   script:
   - mkdir ${CI_PROJECT_DIR}/faildumps
@@ -138,6 +142,17 @@ behat:
     paths:
       - ${CI_PROJECT_DIR}/faildumps/
 
+wp403r:
+  before_script:
+    - export MOODLE_REPO=$MOODLE_REPO_WORKPLACE
+    - export MOODLE_BRANCH=$MOODLE_BRANCH_WORKPLACE403R
+    - export CLONEWPPLUGINS=1
+  <<: *scriptshorttest
+  except:
+    - master
+    - tags
+    - /^WORKPLACE_\d+$/
+
 wp403s:
   before_script:
     - export MOODLE_REPO=$MOODLE_REPO_WORKPLACE
@@ -228,3 +243,13 @@ lms403:
   except:
     - master
     - tags
+
+lms404:
+  image: moodlehq/moodle-workplace-plugin-ci:8.1
+  before_script:
+    - export MOODLE_REPO=$MOODLE_REPO_LMS
+    - export MOODLE_BRANCH=$MOODLE_BRANCH_LMS404
+  <<: *scriptshorttest
+  except:
+    - master
+    - tags

CHANGELOG.md

@@ -3,6 +3,7 @@
 ## Unreleased
 ### Added
 - Added a new issued certificate regenerated event.
+- Compatibility with Moodle 4.4, added to the testing matrix
 ### Fixed
 - Coding style fixes to comply with moodle-plugin-ci 4.4.0
 

version.php

@@ -29,4 +29,4 @@
 $plugin->version      = 2023122800;
 $plugin->requires     = 2022041900.00;
 $plugin->maturity     = MATURITY_STABLE;
-$plugin->supported    = [400, 403];
+$plugin->supported    = [400, 404];