From f939365eb8f07e857ba1b46884a8a68369ea492b Mon Sep 17 00:00:00 2001 From: Paul Holden Date: Wed, 24 Feb 2021 21:36:30 +0000 Subject: [PATCH 1/2] Document site summary argument in installation script. Available since MDL-70643 (ignored in prior versions), fixes #121. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d865b6bdb76..e9306ef2bb0 100644 --- a/README.md +++ b/README.md @@ -91,7 +91,7 @@ Notes: ```bash # Initialize Moodle database for manual testing -bin/moodle-docker-compose exec webserver php admin/cli/install_database.php --agree-license --fullname="Docker moodle" --shortname="docker_moodle" --adminpass="test" --adminemail="admin@example.com" +bin/moodle-docker-compose exec webserver php admin/cli/install_database.php --agree-license --fullname="Docker moodle" --shortname="docker_moodle" --summary="Docker moodle site" --adminpass="test" --adminemail="admin@example.com" ``` Notes: From c4ce1ec0bb6e81a9cc92f8b4e68192790c2600de Mon Sep 17 00:00:00 2001 From: "Eloy Lafuente (stronk7)" Date: Sat, 8 May 2021 15:59:00 +0200 Subject: [PATCH 2/2] Test php80 combinations with 311 and master Also, tweak phpunit execution to use --filter so it works in all versions. --- .travis.yml | 40 +++++++++++++++++++++++++++------------- tests/test.sh | 2 +- 2 files changed, 28 insertions(+), 14 deletions(-) diff --git a/.travis.yml b/.travis.yml index 528ceddbd72..d5dc57f934c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,16 +1,20 @@ -language: bash +language: shell + +os: linux +dist: xenial + services: docker -fast_finish: true + env: # phpunit # PostgreSQL highest, lowest php supported # We have set the "phpunit-full" to run against master - - "PHP=7.4 DB=pgsql GIT=master SUITE=phpunit-full" + - "PHP=8.0 DB=pgsql GIT=master SUITE=phpunit-full" - "PHP=7.3 DB=pgsql GIT=master SUITE=phpunit-full" - # Other dev branches, also "phpunit-full" - - "PHP=7.4 DB=pgsql GIT=MOODLE_311_STABLE SUITE=phpunit-full" - - "PHP=7.3 DB=pgsql GIT=MOODLE_311_STABLE SUITE=phpunit-full" + # Other dev branches, also "phpunit-full" (parallel dev periods) # Simpler "phpunit" for stables + - "PHP=8.0 DB=pgsql GIT=MOODLE_311_STABLE SUITE=phpunit" + - "PHP=7.3 DB=pgsql GIT=MOODLE_311_STABLE SUITE=phpunit" - "PHP=7.4 DB=pgsql GIT=v3.10.0 SUITE=phpunit" - "PHP=7.2 DB=pgsql GIT=v3.10.0 SUITE=phpunit" - "PHP=7.4 DB=pgsql GIT=v3.9.1 SUITE=phpunit" @@ -20,31 +24,35 @@ env: - "PHP=7.2 DB=pgsql GIT=v3.5.8 SUITE=phpunit" - "PHP=7.0 DB=pgsql GIT=v3.5.8 SUITE=phpunit" # Other databases, only highest php supported + - "PHP=8.0 DB=mssql GIT=MOODLE_311_STABLE SUITE=phpunit" - "PHP=7.4 DB=mssql GIT=v3.10.0 SUITE=phpunit" - "PHP=7.4 DB=mssql GIT=v3.9.1 SUITE=phpunit" - "PHP=7.4 DB=mssql GIT=v3.8.4 SUITE=phpunit" - "PHP=7.2 DB=mssql GIT=v3.5.8 SUITE=phpunit" + - "PHP=8.0 DB=mysql GIT=MOODLE_311_STABLE SUITE=phpunit" - "PHP=7.4 DB=mysql GIT=v3.10.0 SUITE=phpunit" - "PHP=7.4 DB=mysql GIT=v3.9.1 SUITE=phpunit" - "PHP=7.4 DB=mysql GIT=v3.8.4 SUITE=phpunit" - "PHP=7.2 DB=mysql GIT=v3.5.8 SUITE=phpunit" + - "PHP=8.0 DB=oracle GIT=MOODLE_311_STABLE SUITE=phpunit" - "PHP=7.4 DB=oracle GIT=v3.10.0 SUITE=phpunit" - "PHP=7.4 DB=oracle GIT=v3.9.1 SUITE=phpunit" - "PHP=7.4 DB=oracle GIT=v3.8.4 SUITE=phpunit" - "PHP=7.2 DB=oracle GIT=v3.5.8 SUITE=phpunit" # MariaDB, only lowest php supported + - "PHP=7.3 DB=mariadb GIT=MOODLE_311_STABLE SUITE=phpunit" - "PHP=7.2 DB=mariadb GIT=v3.10.0 SUITE=phpunit" - "PHP=7.2 DB=mariadb GIT=v3.9.1 SUITE=phpunit" - "PHP=7.1 DB=mariadb GIT=v3.8.4 SUITE=phpunit" - "PHP=7.0 DB=mariadb GIT=v3.5.8 SUITE=phpunit" # behat # PostgreSQL highest, lowest (2 browsers) - - "PHP=7.4 DB=pgsql GIT=master SUITE=behat BROWSER=chrome" - - "PHP=7.4 DB=pgsql GIT=master SUITE=behat BROWSER=firefox" + - "PHP=8.0 DB=pgsql GIT=master SUITE=behat BROWSER=chrome" + - "PHP=8.0 DB=pgsql GIT=master SUITE=behat BROWSER=firefox" - "PHP=7.3 DB=pgsql GIT=master SUITE=behat BROWSER=chrome" - "PHP=7.3 DB=pgsql GIT=master SUITE=behat BROWSER=firefox" - - "PHP=7.4 DB=pgsql GIT=MOODLE_311_STABLE SUITE=behat BROWSER=chrome" - - "PHP=7.4 DB=pgsql GIT=MOODLE_311_STABLE SUITE=behat BROWSER=firefox" + - "PHP=8.0 DB=pgsql GIT=MOODLE_311_STABLE SUITE=behat BROWSER=chrome" + - "PHP=8.0 DB=pgsql GIT=MOODLE_311_STABLE SUITE=behat BROWSER=firefox" - "PHP=7.3 DB=pgsql GIT=MOODLE_311_STABLE SUITE=behat BROWSER=chrome" - "PHP=7.3 DB=pgsql GIT=MOODLE_311_STABLE SUITE=behat BROWSER=firefox" - "PHP=7.4 DB=pgsql GIT=v3.10.0 SUITE=behat BROWSER=chrome" @@ -64,26 +72,32 @@ env: - "PHP=7.0 DB=pgsql GIT=v3.5.8 SUITE=behat BROWSER=chrome" - "PHP=7.0 DB=pgsql GIT=v3.5.8 SUITE=behat BROWSER=firefox" # Other databases, only highest php supported (1 browsers) + - "PHP=8.0 DB=mssql GIT=MOODLE_311_STABLE SUITE=behat BROWSER=chrome" - "PHP=7.4 DB=mssql GIT=v3.10.0 SUITE=behat BROWSER=firefox" - "PHP=7.4 DB=mssql GIT=v3.9.1 SUITE=behat BROWSER=chrome" - "PHP=7.4 DB=mssql GIT=v3.8.4 SUITE=behat BROWSER=firefox" - "PHP=7.2 DB=mssql GIT=v3.5.8 SUITE=behat BROWSER=chrome" + - "PHP=8.0 DB=mysql GIT=MOODLE_311_STABLE SUITE=behat BROWSER=chrome" - "PHP=7.4 DB=mysql GIT=v3.10.0 SUITE=behat BROWSER=firefox" - "PHP=7.4 DB=mysql GIT=v3.9.1 SUITE=behat BROWSER=chrome" - "PHP=7.4 DB=mysql GIT=v3.8.4 SUITE=behat BROWSER=firefox" - "PHP=7.2 DB=mysql GIT=v3.5.8 SUITE=behat BROWSER=chrome" + - "PHP=8.0 DB=oracle GIT=MOODLE_311_STABLE SUITE=behat BROWSER=chrome" - "PHP=7.4 DB=oracle GIT=v3.10.0 SUITE=behat BROWSER=firefox" - "PHP=7.4 DB=oracle GIT=v3.9.1 SUITE=behat BROWSER=chrome" - "PHP=7.4 DB=oracle GIT=v3.8.4 SUITE=behat BROWSER=firefox" - "PHP=7.2 DB=oracle GIT=v3.5.8 SUITE=behat BROWSER=chrome" # MariaDB, only lowest php supported (1 browsers) + - "PHP=7.3 DB=mariadb GIT=MOODLE_311_STABLE SUITE=behat BROWSER=firefox" - "PHP=7.2 DB=mariadb GIT=v3.10.0 SUITE=behat BROWSER=chrome" - "PHP=7.2 DB=mariadb GIT=v3.9.1 SUITE=behat BROWSER=firefox" - "PHP=7.2 DB=mariadb GIT=v3.8.4 SUITE=behat BROWSER=chrome" - "PHP=7.0 DB=mariadb GIT=v3.5.8 SUITE=behat BROWSER=firefox" - # Mobile app - - "PHP=7.4 DB=pgsql GIT=master SUITE=behat-app-development BROWSER=chrome APP_VERSION=3.9.0 APP_PATH=$HOME/app" - - "PHP=7.4 DB=pgsql GIT=master SUITE=behat-app BROWSER=chrome APP_VERSION=3.9.0" + # Mobile app, highest, lowest + - "PHP=8.0 DB=pgsql GIT=master SUITE=behat-app-development BROWSER=chrome APP_VERSION=3.9.0 APP_PATH=$HOME/app" + - "PHP=8.0 DB=pgsql GIT=master SUITE=behat-app BROWSER=chrome APP_VERSION=3.9.0" + - "PHP=7.3 DB=pgsql GIT=master SUITE=behat-app-development BROWSER=chrome APP_VERSION=3.9.0 APP_PATH=$HOME/app" + - "PHP=7.3 DB=pgsql GIT=master SUITE=behat-app BROWSER=chrome APP_VERSION=3.9.0" install: - git clone --branch $GIT --depth 1 git://github.com/moodle/moodle $HOME/moodle - cp config.docker-template.php $HOME/moodle/config.php diff --git a/tests/test.sh b/tests/test.sh index 49208514075..8fb29c8bf60 100755 --- a/tests/test.sh +++ b/tests/test.sh @@ -5,7 +5,7 @@ basedir="$( cd "$( dirname "${BASH_SOURCE[0]}" )/../" && pwd )" if [ "$SUITE" = "phpunit" ]; then - testcmd="bin/moodle-docker-compose exec -T webserver vendor/bin/phpunit core_dml_testcase lib/dml/tests/dml_test.php" + testcmd="bin/moodle-docker-compose exec -T webserver vendor/bin/phpunit --filter core_dml_testcase" elif [ "$SUITE" = "behat" ]; then testcmd="bin/moodle-docker-compose exec -T webserver php admin/tool/behat/cli/run.php --tags=@auth_manual"