initial attempt to move ci checks to their own jobs

.github/actions/matrix/matrix_includes.yml

@@ -1,28 +1,23 @@
 include:
   # Always include main (issue #18) - disable-able by config by setting 'disable_master' to true
-  - {moodle-branch: 'main', php: '8.4', node: '22.11', mariadb-ver: '10.11', pgsql-ver: '14', database: 'pgsql'}
+  - {moodle-branch: 'main', php: '8.4', node: '22', mariadb-ver: '10.11', pgsql-ver: '15', database: 'pgsql'}
   # Test all variants of 5.1
-  - { moodle-branch: 'MOODLE_501_STABLE', php: '8.4', node: '22.11', mariadb-ver: '10.11', pgsql-ver: '15', database: 'mariadb' }
-  - { moodle-branch: 'MOODLE_501_STABLE', php: '8.4', node: '22.11', mariadb-ver: '10.11', pgsql-ver: '15', database: 'pgsql' }
-  - { moodle-branch: 'MOODLE_501_STABLE', php: '8.2', node: '22.11', mariadb-ver: '10.11', pgsql-ver: '15', database: 'mariadb' }
-  - { moodle-branch: 'MOODLE_501_STABLE', php: '8.2', node: '22.11', mariadb-ver: '10.11', pgsql-ver: '15', database: 'pgsql' }
+  - { moodle-branch: 'MOODLE_501_STABLE', php: '8.4', node: '22', mariadb-ver: '10.11', pgsql-ver: '15', database: 'mariadb' }
+  - { moodle-branch: 'MOODLE_501_STABLE', php: '8.4', node: '22', mariadb-ver: '10.11', pgsql-ver: '15', database: 'pgsql' }
+  - { moodle-branch: 'MOODLE_501_STABLE', php: '8.2', node: '22', mariadb-ver: '10.11', pgsql-ver: '15', database: 'mariadb' }
+  - { moodle-branch: 'MOODLE_501_STABLE', php: '8.2', node: '22', mariadb-ver: '10.11', pgsql-ver: '15', database: 'pgsql' }
   # Test all variants of 5.0
-  - { moodle-branch: 'MOODLE_500_STABLE', php: '8.4', node: '22.11', mariadb-ver: '10.11', pgsql-ver: '14', database: 'mariadb' }
-  - { moodle-branch: 'MOODLE_500_STABLE', php: '8.4', node: '22.11', mariadb-ver: '10.11', pgsql-ver: '14', database: 'pgsql' }
-  - { moodle-branch: 'MOODLE_500_STABLE', php: '8.2', node: '22.11', mariadb-ver: '10.11', pgsql-ver: '14', database: 'mariadb' }
-  - { moodle-branch: 'MOODLE_500_STABLE', php: '8.2', node: '22.11', mariadb-ver: '10.11', pgsql-ver: '14', database: 'pgsql' }
+  - { moodle-branch: 'MOODLE_500_STABLE', php: '8.4', node: '22', mariadb-ver: '10.11', pgsql-ver: '14', database: 'mariadb' }
+  - { moodle-branch: 'MOODLE_500_STABLE', php: '8.4', node: '22', mariadb-ver: '10.11', pgsql-ver: '14', database: 'pgsql' }
+  - { moodle-branch: 'MOODLE_500_STABLE', php: '8.2', node: '22', mariadb-ver: '10.11', pgsql-ver: '14', database: 'mariadb' }
+  - { moodle-branch: 'MOODLE_500_STABLE', php: '8.2', node: '22', mariadb-ver: '10.11', pgsql-ver: '14', database: 'pgsql' }
   # Test all variants of 4.5.
-  - { moodle-branch: 'MOODLE_405_STABLE', php: '8.3', node: '20.11', mariadb-ver: '10.6', pgsql-ver: '13', database: 'mariadb' }
-  - { moodle-branch: 'MOODLE_405_STABLE', php: '8.3', node: '20.11', mariadb-ver: '10.6', pgsql-ver: '13', database: 'pgsql' }
-  - { moodle-branch: 'MOODLE_405_STABLE', php: '8.1', node: '20.11', mariadb-ver: '10.6', pgsql-ver: '13', database: 'mariadb' }
-  - { moodle-branch: 'MOODLE_405_STABLE', php: '8.1', node: '20.11', mariadb-ver: '10.6', pgsql-ver: '13', database: 'pgsql' }
+  - { moodle-branch: 'MOODLE_405_STABLE', php: '8.3', node: '22', mariadb-ver: '10.6', pgsql-ver: '13', database: 'mariadb' }
+  - { moodle-branch: 'MOODLE_405_STABLE', php: '8.3', node: '22', mariadb-ver: '10.6', pgsql-ver: '13', database: 'pgsql' }
+  - { moodle-branch: 'MOODLE_405_STABLE', php: '8.1', node: '22', mariadb-ver: '10.6', pgsql-ver: '13', database: 'mariadb' }
+  - { moodle-branch: 'MOODLE_405_STABLE', php: '8.1', node: '22', mariadb-ver: '10.6', pgsql-ver: '13', database: 'pgsql' }
   # Test all variants of 4.1 (LTS).
-  - { moodle-branch: 'MOODLE_401_STABLE', php: '7.4', node: '20.11', mariadb-ver: '10.5', pgsql-ver: '12', database: 'mariadb' }
-  - { moodle-branch: 'MOODLE_401_STABLE', php: '7.4', node: '20.11', mariadb-ver: '10.5', pgsql-ver: '12', database: 'pgsql' }
-  - { moodle-branch: 'MOODLE_401_STABLE', php: '8.0', node: '20.11', mariadb-ver: '10.5', pgsql-ver: '12', database: 'mariadb' }
-  - { moodle-branch: 'MOODLE_401_STABLE', php: '8.0', node: '20.11', mariadb-ver: '10.5', pgsql-ver: '12', database: 'pgsql' }
-  # Also test all variants of 3.9 (LTS).
-  - {moodle-branch: 'MOODLE_39_STABLE', php: '7.4', node: '16.20', mariadb-ver: '10.5', pgsql-ver: '10', database: 'mariadb'}
-  - {moodle-branch: 'MOODLE_39_STABLE', php: '7.4', node: '16.20', mariadb-ver: '10.5', pgsql-ver: '10', database: 'pgsql'}
-  - {moodle-branch: 'MOODLE_39_STABLE', php: '7.4', node: '16.20', mariadb-ver: '10.5', pgsql-ver: '10', database: 'mariadb'}
-  - {moodle-branch: 'MOODLE_39_STABLE', php: '7.4', node: '16.20', mariadb-ver: '10.5', pgsql-ver: '10', database: 'pgsql'}
+  - { moodle-branch: 'MOODLE_401_STABLE', php: '7.4', node: '22', mariadb-ver: '10.5', pgsql-ver: '12', database: 'mariadb' }
+  - { moodle-branch: 'MOODLE_401_STABLE', php: '7.4', node: '22', mariadb-ver: '10.5', pgsql-ver: '12', database: 'pgsql' }
+  - { moodle-branch: 'MOODLE_401_STABLE', php: '8.0', node: '22', mariadb-ver: '10.5', pgsql-ver: '12', database: 'mariadb' }
+  - { moodle-branch: 'MOODLE_401_STABLE', php: '8.0', node: '22', mariadb-ver: '10.5', pgsql-ver: '12', database: 'pgsql' }

.github/actions/parse-version/script.php

@@ -63,6 +63,16 @@ function output(string $name, string $value) {
 $updates = json_decode(file_get_contents('https://download.moodle.org/api/1.3/updates.php?format=json&version=0.0&branch=3.8'), true);
 $updates = $updates['updates']['core'] ?? [];
 
+
+// Helper to normalize container name
+function container_image_name($moodle_branch, $php) {
+    $repo = 'catalyst-moodle-workflows-'
+        . str_replace('_', '-', strtolower($moodle_branch))
+        . '-'
+        . str_replace('_', '-', strtolower($php));
+    return "ghcr.io/catalyst/$repo:latest";
+}
+
 $preparedMatrix = array_filter($matrix['include'], function($entry) use($plugin, $updates, $matrix) {
 
     if (!isset($entry)) {
@@ -161,12 +171,49 @@ function output(string $name, string $value) {
     return false;
 });
 
-$jsonMatrix = json_encode(['include' => array_values($preparedMatrix)], JSON_UNESCAPED_SLASHES);
+
+// Add container image name to each entry
+$finalMatrix = array_map(function($entry) {
+    $entry['container'] = container_image_name($entry['moodle-branch'], $entry['php']);
+    return $entry;
+}, array_values($preparedMatrix));
+
+$jsonMatrix = json_encode(['include' => $finalMatrix], JSON_UNESCAPED_SLASHES);
 output('matrix', $jsonMatrix);
 
 // Output the component / plugin name (which would be useful e.g. for a release)
 output('component', $plugin->component);
 
+
 // Output the highest available moodle branch in this set, which will be used to
 // determine whether or not various tests/tasks will run, such as grunt.
-output('highest_moodle_branch', reset($preparedMatrix)['moodle-branch'] ?? '');
+$highestMoodleBranch = reset($preparedMatrix)['moodle-branch'] ?? '';
+output('highest_moodle_branch', $highestMoodleBranch);
+
+// Find the highest PHP version for the highest moodle branch
+$phpVersions = [];
+foreach ($finalMatrix as $entry) {
+    if ($entry['moodle-branch'] === $highestMoodleBranch) {
+        $phpVersions[] = $entry['php'];
+    }
+}
+if (!empty($phpVersions)) {
+    // Use version_compare to find the highest PHP version
+    usort($phpVersions, 'version_compare');
+    $highestPhp = end($phpVersions);
+    // Find the container for this combo
+    foreach ($finalMatrix as $entry) {
+        if ($entry['moodle-branch'] === $highestMoodleBranch && $entry['php'] === $highestPhp) {
+            output('latest_container', $entry['container']);
+            if (isset($entry['pgsql-ver'])) {
+                output('latest_pgsql_ver', $entry['pgsql-ver']);
+            } else {
+                output('latest_pgsql_ver', '');
+            }
+            break;
+        }
+    }
+} else {
+    output('latest_container', '');
+    output('latest_pgsql_ver', '');
+}

.github/plugin/setup/action.yml

@@ -1,36 +1,12 @@
 name: 'Plugin setup'
 description: 'Run plugin setup'
 inputs:
-  codechecker_max_warnings:
-    description: 'Sets the value for --max-warnings on the moodle-plugin-ci codechecker step. Defaults to -1 which means no limit.'
-    default: '-1'
   extra_php_extensions:
     description: 'List of additional php packages to install'
   extra_plugin_runners:
     description: 'Command to install dependencies'
-  disable_behat:
-    description: 'Option to disable behat tests'
-  disable_mustache:
-    description: 'Option to disable mustache tests'
-  disable_phpdoc:
-    description: 'Option to disable phpdoc tests'
-  disable_phpcs:
-    description: 'Option to disable code standards (codechecker) tests'
-  disable_phplint:
-    description: 'Option to disable phplint tests'
-  disable_phpunit:
-    description: 'Option to disable phpunit tests'
-  disable_grunt:
-    description: 'Option to disable grunt'
-  enable_phpmd:
-    description: 'Option to enable phpmd'
-  disable_phpcpd:
-    description: 'Option to disable phpcpd'
-  disable_ci_validate:
-    description: 'Option to disable running moodle-plugin-ci validate'
-
-  highest_moodle_branch:
-    description: 'Holds the value of the highest moodle-branch in the test matrix'
+  moodle_branch:
+    description: 'Moodle branch to use (for patching)'
 runs:
   using: "composite"
   steps:
@@ -39,186 +15,20 @@ runs:
       with:
         path: plugin
         submodules: true
-    - name: Install node  ${{ matrix.node }}
-      uses: actions/setup-node@v2
-      with:
-        node-version: ${{ matrix.node }}
-
-    - name: Setup PHP ${{ matrix.php }}
-      uses: shivammathur/setup-php@9e72090525849c5e82e596468b86eb55e9cc5401 # v2.32.0
-      with:
-        php-version: ${{ matrix.php }}
-        ini-values: max_input_vars=5000
-        extensions: pgsql, mysqli, zip, gd, xmlrpc, soap, ${{ inputs.extra_php_extensions }}
-        coverage: none
-
-    - name: Configure Required Composer Version
-      id: install-composer1
-      if: ${{ matrix.moodle-branch == 'MOODLE_32_STABLE' || matrix.moodle-branch == 'MOODLE_33_STABLE' }}
-      run: |
-        echo "::set-output name=COMPOSER_VERSION::--1"
-      shell: bash
-
-    - name: Update Composer
-      if: ${{ matrix.moodle-branch == 'MOODLE_32_STABLE' || matrix.moodle-branch == 'MOODLE_33_STABLE' }}
-      run: |
-        composer self-update ${{ steps.install-composer1.outputs.COMPOSER_VERSION }}
-      shell: bash
-
-    - name: Initialise moodle-plugin-ci
-      run: |
-        # Initialise moodle-plugin-ci (install via composer)
-        echo "::group::Initialise moodle-plugin-ci"
-
-        composer create-project -n --no-dev --prefer-dist moodlehq/moodle-plugin-ci m-ci ^4
-        # Add dirs to $PATH
-        echo $(cd m-ci/bin; pwd) >> $GITHUB_PATH
-        echo $(cd m-ci/vendor/bin; pwd) >> $GITHUB_PATH
-        # PHPUnit depends on en_AU.UTF-8 locale
-        sudo locale-gen en_AU.UTF-8
-
-        echo "::endgroup::"
-      shell: bash
-
     - name: Install dependencies
       if: ${{ inputs.extra_plugin_runners }}
       run: |
         # Install dependencies
         echo "::group::Install dependencies"
-
         ${{ inputs.extra_plugin_runners }}
-
         echo "::endgroup::"
       shell: bash
-
-    - name: Clone Moodle
-      # Clone to a temporary directory
-      run: |
-        echo "::group::Moodle clone output"
-
-        git clone https://github.com/moodle/moodle.git --branch $MOODLE_BRANCH $GITHUB_WORKSPACE/moodletemp
-
-        echo "::endgroup::"
-      shell: bash
-      env:
-        DB: ${{ matrix.database }}
-        MOODLE_BRANCH: ${{ matrix.moodle-branch }}
-
     - name: Install Core Patches
       if: ${{ always() }}
-      # Install core patches to moodle in temporary directory
       run: |
         git config --global user.email "test@test.com"
         git config --global user.name "Test"
-        ((test -f plugin/patch/${{ matrix.moodle-branch }}.diff && cd $GITHUB_WORKSPACE/moodletemp && git am --whitespace=nowarn < ../plugin/patch/${{ matrix.moodle-branch }}.diff) || echo No patch found;)
-      shell: bash
-
-    - name: Install Moodle and Plugin
-      # Install moodle, but use our temporary directory to include any potential core patches that have been applied.
-      run: |
-        # Install moodle commands
-        echo "::group::Moodle install output"
-
-        # This is a workaround for https://github.com/moodlehq/moodle-plugin-ci/issues/306 - we disable the git repository validation to allow folder cloning.
-        sed -i '/public function gitUrl($url)/{n; s/{/& return $url;/}' $GITHUB_WORKSPACE/m-ci/src/Validate.php
-
-        moodle-plugin-ci install -vvv --plugin ./plugin --db-host=127.0.0.1 --repo $GITHUB_WORKSPACE/moodletemp
-
-        echo "::endgroup::"
-      shell: bash
-      env:
-        DB: ${{ matrix.database }}
-        MOODLE_BRANCH: ${{ matrix.moodle-branch }}
-
-    - name: Run phplint
-      if: ${{ always() && inputs.disable_phplint != 'true' }}
-      run: moodle-plugin-ci phplint
-      shell: bash
-
-    - name: Run codechecker
-      if: ${{ always() && inputs.disable_phpcs != 'true' }}
-      run: moodle-plugin-ci codechecker --max-warnings=${{ inputs.codechecker_max_warnings }}
-      shell: bash
-
-    - name: Run validate
-      if: ${{ always() && inputs.disable_ci_validate != 'true' }}
-      run: moodle-plugin-ci validate
+        ((test -f plugin/patch/${{ inputs.moodle_branch }}.diff && cd /moodle && git am --whitespace=nowarn < ../plugin/patch/${{ inputs.moodle_branch }}.diff) || echo No patch found;)
       shell: bash
 
-    - name: Run savepoints
-      if: ${{ always() }}
-      run: moodle-plugin-ci savepoints
-      shell: bash
-
-    - name: Run mustache
-      if: ${{ always() && inputs.disable_mustache != 'true' }}
-      run: moodle-plugin-ci mustache
-      shell: bash
 
-    - name: Run grunt
-      if: ${{ always() && inputs.disable_grunt != 'true' && inputs.highest_moodle_branch == matrix.moodle-branch }}
-      run: moodle-plugin-ci grunt
-      shell: bash
-
-    - name: Run phpunit
-      if: ${{ always() && inputs.disable_phpunit != 'true' }}
-      run: |
-        moodle-plugin-ci phpunit
-        cd moodle
-        vendor/bin/phpunit --fail-on-risky --disallow-test-output --filter tool_dataprivacy_metadata_registry_testcase
-        vendor/bin/phpunit --fail-on-risky --disallow-test-output --testsuite core_privacy_testsuite --filter provider_testcase
-      shell: bash
-
-    - name: Run behat
-      if: ${{ always() && inputs.disable_behat != 'true' }}
-      run: moodle-plugin-ci behat --profile chrome
-      shell: bash
-
-    - name: PHP Copy/Paste Detector
-      if: ${{ always() && inputs.disable_phpcpd != 'true' }}
-      run: moodle-plugin-ci phpcpd
-      shell: bash
-
-    - name: PHP Mess Detector
-      if: ${{ always() && inputs.enable_phpmd == 'true' }}
-      run: moodle-plugin-ci phpmd
-      shell: bash
-
-    - name: Moodle PHPDoc Checker
-      if: ${{ always() && inputs.disable_phpdoc != 'true' && inputs.highest_moodle_branch == matrix.moodle-branch }}
-      # Run this check and only fail CI if it's on 4.0+ / master
-      run: |
-        # phpdoc checks
-
-        # Don't stop on faiures
-        set +e
-
-        # Note this block whilst large, was made so that it can be pasted locally if needed and isn't CI specific
-        # Disclaimer: you'll need to adjust the main command but otherwise the handling of output remains the same.
-        output=`GITHUB_PATH=$GITHUB_PATH moodle-plugin-ci phpdoc`
-        haserrors=$?
-
-        # No errors? Print and return.
-        if [[ $haserrors -eq 0 ]]; then
-          echo "phpdoc checks - OK"
-          exit 0
-        fi
-
-        # Skip incorrect errors/warnings and retain the relevant lines.
-        output=`echo "$output" | grep -v 'Class ( is not documented' | grep -v 'Could not connect to debugging client.'`
-        output=`echo "$output" | grep -B1 'Line'`
-
-        # Filter out github actions paths from the output. It should only
-        # show the path relevant to the files in the plugin repo.
-        # For example:
-        # from /home/runner/work/moodle-tool_dataflows/moodle-tool_dataflows/moodle/admin/tool/dataflows/db/upgrade.php
-        # to   db/upgrade.php at best,
-        # or   admin/tool/dataflows/db/upgrade.php
-        currentdir=$(pwd)
-        if [[ "$output" ]]; then
-          echo "$output" | sed -e "s,$currentdir/,,g" | sed -e "s,^moodle/,,g" | tee $GITHUB_STEP_SUMMARY
-          exit 1
-        fi
-
-        echo "phpdoc checks - OK"
-      shell: bash