From d8285b38adad23929e7f922e235d663163d57f8e Mon Sep 17 00:00:00 2001 From: Sara Arjona Date: Mon, 2 Dec 2024 16:38:32 +0100 Subject: [PATCH] Increase Moodle 5.0 requirements 5.0 agreed environment requirements: - PHP 8.2 - PostgreSQL 14 - MySQL 8.4 - MariaDB 10.11.0 Apart from this, the Moodle 4.5 branch has also been added to GHA. --- .github/workflows/ci.yml | 10 ++++++++-- README.md | 2 +- bin/moodle-docker-compose | 2 +- bin/moodle-docker-compose.cmd | 2 +- db.mariadb.yml | 2 +- db.mysql.yml | 2 +- db.pgsql.yml | 2 +- 7 files changed, 14 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 48f58ed5975..68041229920 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -138,7 +138,9 @@ jobs: include: # PostgreSQL (highest, lowest php supported) - { branch: main, php: "8.3", database: pgsql, browser: chrome, suite: behat } - - { branch: main, php: "8.1", database: pgsql, browser: firefox, suite: behat } + - { branch: main, php: "8.2", database: pgsql, browser: firefox, suite: behat } + - { branch: MOODLE_405_STABLE, php: "8.3", database: pgsql, browser: chrome, suite: behat } + - { branch: MOODLE_405_STABLE, php: "8.1", database: pgsql, browser: firefox, suite: behat } - { branch: MOODLE_404_STABLE, php: "8.3", database: pgsql, browser: chrome, suite: behat } - { branch: MOODLE_404_STABLE, php: "8.1", database: pgsql, browser: firefox, suite: behat } - { branch: MOODLE_403_STABLE, php: "8.2", database: pgsql, browser: chrome, suite: behat } @@ -156,7 +158,8 @@ jobs: - { branch: MOODLE_39_STABLE, php: "7.4", database: pgsql, browser: chrome, suite: behat } - { branch: MOODLE_39_STABLE, php: "7.2", database: pgsql, browser: firefox, suite: behat } # MariaDB (lowest php supported) - - { branch: main, php: "8.1", database: mariadb, browser: chrome, suite: behat } + - { branch: main, php: "8.2", database: mariadb, browser: chrome, suite: behat } + - { branch: MOODLE_405_STABLE, php: "8.1", database: mariadb, browser: firefox, suite: behat } - { branch: MOODLE_404_STABLE, php: "8.1", database: mariadb, browser: firefox, suite: behat } - { branch: MOODLE_403_STABLE, php: "8.0", database: mariadb, browser: firefox, suite: behat } - { branch: MOODLE_402_STABLE, php: "8.0", database: mariadb, browser: firefox, suite: behat } @@ -167,6 +170,7 @@ jobs: - { branch: MOODLE_39_STABLE, php: "7.2", database: mariadb, browser: chrome, suite: behat } # Other databases (highest php supported") - { branch: main, php: "8.3", database: mssql, browser: firefox, suite: behat } + - { branch: MOODLE_405_STABLE, php: "8.3", database: mssql, browser: chrome, suite: behat } - { branch: MOODLE_404_STABLE, php: "8.3", database: mssql, browser: chrome, suite: behat } - { branch: MOODLE_403_STABLE, php: "8.2", database: mssql, browser: chrome, suite: behat } - { branch: MOODLE_402_STABLE, php: "8.2", database: mssql, browser: chrome, suite: behat } @@ -176,6 +180,7 @@ jobs: - { branch: MOODLE_310_STABLE, php: "7.4", database: mssql, browser: chrome, suite: behat } - { branch: MOODLE_39_STABLE, php: "7.4", database: mssql, browser: firefox, suite: behat } - { branch: main, php: "8.3", database: mysql, browser: chrome, suite: behat } + - { branch: MOODLE_405_STABLE, php: "8.3", database: mysql, browser: firefox, suite: behat } - { branch: MOODLE_404_STABLE, php: "8.3", database: mysql, browser: firefox, suite: behat } - { branch: MOODLE_403_STABLE, php: "8.2", database: mysql, browser: firefox, suite: behat } - { branch: MOODLE_402_STABLE, php: "8.2", database: mysql, browser: firefox, suite: behat } @@ -185,6 +190,7 @@ jobs: - { branch: MOODLE_310_STABLE, php: "7.4", database: mysql, browser: firefox, suite: behat } - { branch: MOODLE_39_STABLE, php: "7.4", database: mysql, browser: chrome, suite: behat } - { branch: main, php: "8.3", database: oracle, browser: firefox, suite: behat } + - { branch: MOODLE_405_STABLE, php: "8.3", database: oracle, browser: chrome, suite: behat } - { branch: MOODLE_404_STABLE, php: "8.3", database: oracle, browser: chrome, suite: behat } - { branch: MOODLE_403_STABLE, php: "8.2", database: oracle, browser: chrome, suite: behat } - { branch: MOODLE_402_STABLE, php: "8.2", database: oracle, browser: chrome, suite: behat } diff --git a/README.md b/README.md index cdab2cfa602..7545da8769e 100644 --- a/README.md +++ b/README.md @@ -216,7 +216,7 @@ When you change them, use `bin/moodle-docker-compose down && bin/moodle-docker-c | `MOODLE_DOCKER_DB` | yes | pgsql, mariadb, mysql, mssql, oracle | none | The database server to run against | | `MOODLE_DOCKER_WWWROOT` | yes | path on your file system | none | The path to the Moodle codebase you intend to test | | `MOODLE_DOCKER_DB_VERSION` | no | Docker tag - see relevant database page on docker-hub | mysql: 8.0
pgsql: 13
mariadb: 10.7
mssql: 2017-latest
oracle: 21| The database server docker image tag | -| `MOODLE_DOCKER_PHP_VERSION` | no | 8.1, 8.0, 7.4, 7.3, 7.2, 7.1, 7.0, 5.6| 8.1 | The php version to use | +| `MOODLE_DOCKER_PHP_VERSION` | no | 8.1, 8.0, 7.4, 7.3, 7.2, 7.1, 7.0, 5.6| 8.2 | The php version to use | | `MOODLE_DOCKER_BROWSER` | no | firefox, chrome, firefox:<tag>, chrome:<tag> | firefox:3 | The browser to run Behat against. Supports a colon notation to specify a specific Selenium docker image version to use. e.g. firefox:2.53.1 can be used to run with older versions of Moodle (<3.5) | | `MOODLE_DOCKER_PHPUNIT_EXTERNAL_SERVICES` | no | any value | not set | If set, dependencies for memcached, redis, solr, and openldap are added | | `MOODLE_DOCKER_BBB_MOCK` | no | any value | not set | If set the BigBlueButton mock image is started and configured | diff --git a/bin/moodle-docker-compose b/bin/moodle-docker-compose index 473b06cd6ff..716965b7373 100755 --- a/bin/moodle-docker-compose +++ b/bin/moodle-docker-compose @@ -33,7 +33,7 @@ dockercompose="${dockercompose} -f ${basedir}/base.yml" dockercompose="${dockercompose} -f ${basedir}/service.mail.yml" # PHP Version. -export MOODLE_DOCKER_PHP_VERSION=${MOODLE_DOCKER_PHP_VERSION:-8.1} +export MOODLE_DOCKER_PHP_VERSION=${MOODLE_DOCKER_PHP_VERSION:-8.2} # Database flavour. dockercompose="${dockercompose} -f ${basedir}/db.${MOODLE_DOCKER_DB}.yml" diff --git a/bin/moodle-docker-compose.cmd b/bin/moodle-docker-compose.cmd index a51c49756ea..8ee7df306fc 100644 --- a/bin/moodle-docker-compose.cmd +++ b/bin/moodle-docker-compose.cmd @@ -22,7 +22,7 @@ SET DOCKERCOMPOSE=docker-compose -f "%BASEDIR%\base.yml" SET DOCKERCOMPOSE=%DOCKERCOMPOSE% -f "%BASEDIR%\service.mail.yml" IF "%MOODLE_DOCKER_PHP_VERSION%"=="" ( - SET MOODLE_DOCKER_PHP_VERSION=8.1 + SET MOODLE_DOCKER_PHP_VERSION=8.2 ) SET DOCKERCOMPOSE=%DOCKERCOMPOSE% -f "%BASEDIR%\db.%MOODLE_DOCKER_DB%.yml" diff --git a/db.mariadb.yml b/db.mariadb.yml index b355dee9049..ecfa12d80df 100644 --- a/db.mariadb.yml +++ b/db.mariadb.yml @@ -4,7 +4,7 @@ services: MOODLE_DOCKER_DBTYPE: mariadb MOODLE_DOCKER_DBCOLLATION: utf8mb4_bin db: - image: mariadb:${MOODLE_DOCKER_DB_VERSION:-10.7} + image: mariadb:${MOODLE_DOCKER_DB_VERSION:-10.11} command: > --character-set-server=utf8mb4 --collation-server=utf8mb4_bin diff --git a/db.mysql.yml b/db.mysql.yml index d0f49e9b02c..da38330065a 100644 --- a/db.mysql.yml +++ b/db.mysql.yml @@ -4,7 +4,7 @@ services: MOODLE_DOCKER_DBTYPE: mysqli MOODLE_DOCKER_DBCOLLATION: utf8mb4_bin db: - image: mysql:${MOODLE_DOCKER_DB_VERSION:-8.0} + image: mysql:${MOODLE_DOCKER_DB_VERSION:-8.4} command: > --character-set-server=utf8mb4 --collation-server=utf8mb4_bin diff --git a/db.pgsql.yml b/db.pgsql.yml index 4986f38006e..69338fdd4c8 100644 --- a/db.pgsql.yml +++ b/db.pgsql.yml @@ -3,7 +3,7 @@ services: environment: MOODLE_DOCKER_DBTYPE: pgsql db: - image: postgres:${MOODLE_DOCKER_DB_VERSION:-13} + image: postgres:${MOODLE_DOCKER_DB_VERSION:-14} environment: POSTGRES_USER: moodle POSTGRES_PASSWORD: "m@0dl3ing"