Bump version and checks

sharpchi · Oct 30, 2024 · 6b43b2e · 6b43b2e
1 parent 531c3f8
commit 6b43b2e
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 22 deletions.
diff --git a/.github/workflows/moodle-ci.yml b/.github/workflows/moodle-ci.yml
@@ -15,34 +15,37 @@ jobs:
         ports:
           - 5432:5432
         options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 3
+
       mariadb:
         image: mariadb:10
         env:
           MYSQL_USER: 'root'
           MYSQL_ALLOW_EMPTY_PASSWORD: "true"
+          MYSQL_CHARACTER_SET_SERVER: "utf8mb4"
+          MYSQL_COLLATION_SERVER: "utf8mb4_unicode_ci"
         ports:
           - 3306:3306
         options: --health-cmd="mysqladmin ping" --health-interval 10s --health-timeout 5s --health-retries 3
 
     strategy:
       fail-fast: false
-      # matrix:
-      #   php: ['7.3', '7.4', '8.0']
-      #   moodle-branch: ['MOODLE_311_STABLE']
-      #   database: [pgsql, mariadb]
-        # There is an alternative way allowing to define explicitly define which php, moodle-branch
-    # and database to use:
       matrix:
         include:
-          - php: '8.3'
-            moodle-branch: 'MOODLE_405_STABLE'
-            database: mariadb
           - php: '8.1'
+            # Main job. Run all checks that do not require setup and only need to be run once.
+            runchecks: 'all'
             moodle-branch: 'MOODLE_401_STABLE'
-            database: mariadb
+            database: 'pgsql'
           - php: '7.4'
             moodle-branch: 'MOODLE_401_STABLE'
-            database: pgsql
+            database: 'mariadb'
+          - php: '8.3'
+            moodle-branch: 'MOODLE_405_STABLE'
+            database: 'pgsql'
+          - php: '8.1'
+            moodle-branch: 'MOODLE_405_STABLE'
+            database: 'mariadb'
+
     steps:
       - name: Check out repository code
         uses: actions/checkout@v4
@@ -55,6 +58,8 @@ jobs:
           php-version: ${{ matrix.php }}
           extensions: ${{ matrix.extensions }}
           ini-values: max_input_vars=5000
+          # If you are not using code coverage, keep "none". Otherwise, use "pcov" (Moodle 3.10 and up) or "xdebug".
+          # If you try to use code coverage with "none", it will fallback to phpdbg (which has known problems).
           coverage: none
 
       - name: Initialise moodle-plugin-ci
@@ -66,43 +71,44 @@ jobs:
           echo "NVM_DIR=$HOME/.nvm" >> $GITHUB_ENV
 
       - name: Install moodle-plugin-ci
-        run: |
-          moodle-plugin-ci install --plugin ./plugin --db-host=127.0.0.1
+        run: moodle-plugin-ci install --plugin ./plugin --db-host=127.0.0.1
         env:
           DB: ${{ matrix.database }}
           MOODLE_BRANCH: ${{ matrix.moodle-branch }}
+          # Uncomment this to run Behat tests using the Moodle App.
+          # MOODLE_APP: 'true'
 
       - name: PHP Lint
-        if: ${{ !cancelled() }}
+        if: ${{ !cancelled() && matrix.runchecks == 'all' }}
         run: moodle-plugin-ci phplint
 
       - name: PHP Mess Detector
         continue-on-error: true # This step will show errors but will not fail
-        if: ${{ !cancelled() }}
+        if: ${{ !cancelled() && matrix.runchecks == 'all' }}
         run: moodle-plugin-ci phpmd
 
       - name: Moodle Code Checker
-        if: ${{ !cancelled() }}
+        if: ${{ !cancelled() && matrix.runchecks == 'all' }}
         run: moodle-plugin-ci phpcs --max-warnings 0
 
       - name: Moodle PHPDoc Checker
-        if: ${{ !cancelled() }}
+        if: ${{ !cancelled() && matrix.runchecks == 'all' }}
         run: moodle-plugin-ci phpdoc --max-warnings 0
 
       - name: Validating
         if: ${{ !cancelled() }}
         run: moodle-plugin-ci validate
 
       - name: Check upgrade savepoints
-        if: ${{ !cancelled() }}
+        if: ${{ !cancelled() && matrix.runchecks == 'all' }}
         run: moodle-plugin-ci savepoints
 
       - name: Mustache Lint
-        if: ${{ !cancelled() }}
+        if: ${{ !cancelled() && matrix.runchecks == 'all' }}
         run: moodle-plugin-ci mustache
 
       - name: Grunt
-        if: ${{ !cancelled() }}
+        if: ${{ !cancelled() && matrix.runchecks == 'all' }}
         run: moodle-plugin-ci grunt --max-lint-warnings 0
 
       - name: PHPUnit tests

diff --git a/version.php b/version.php
@@ -24,8 +24,9 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2023050401;
+$plugin->version   = 2023050402;
 $plugin->requires  = 2022041900;
 $plugin->component = 'atto_linkadv';
-$plugin->release = '4.1.0';
+$plugin->release = '4.1.2';
 $plugin->maturity = MATURITY_STABLE;
+$plugin->supported = [401, 405];