Skip to content

Commit 296465a

Browse files
stronk7stronk7
authored
Merge pull request #158 from stronk7/ci_php80
Test php80 combinations with 311 and master
2 parents cf06e9a + c4ce1ec commit 296465a

File tree

2 files changed

+28
-14
lines changed

2 files changed

+28
-14
lines changed

‎.travis.yml‎

Lines changed: 27 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,20 @@
1-
language: bash
1+
language: shell
2+
3+
os: linux
4+
dist: xenial
5+
26
services: docker
3-
fast_finish: true
7+
48
env:
59
# phpunit
610
# PostgreSQL highest, lowest php supported
711
# We have set the "phpunit-full" to run against master
8-
- "PHP=7.4 DB=pgsql GIT=master SUITE=phpunit-full"
12+
- "PHP=8.0 DB=pgsql GIT=master SUITE=phpunit-full"
913
- "PHP=7.3 DB=pgsql GIT=master SUITE=phpunit-full"
10-
# Other dev branches, also "phpunit-full"
11-
- "PHP=7.4 DB=pgsql GIT=MOODLE_311_STABLE SUITE=phpunit-full"
12-
- "PHP=7.3 DB=pgsql GIT=MOODLE_311_STABLE SUITE=phpunit-full"
14+
# Other dev branches, also "phpunit-full" (parallel dev periods)
1315
# Simpler "phpunit" for stables
16+
- "PHP=8.0 DB=pgsql GIT=MOODLE_311_STABLE SUITE=phpunit"
17+
- "PHP=7.3 DB=pgsql GIT=MOODLE_311_STABLE SUITE=phpunit"
1418
- "PHP=7.4 DB=pgsql GIT=v3.10.0 SUITE=phpunit"
1519
- "PHP=7.2 DB=pgsql GIT=v3.10.0 SUITE=phpunit"
1620
- "PHP=7.4 DB=pgsql GIT=v3.9.1 SUITE=phpunit"
@@ -20,31 +24,35 @@ env:
2024
- "PHP=7.2 DB=pgsql GIT=v3.5.8 SUITE=phpunit"
2125
- "PHP=7.0 DB=pgsql GIT=v3.5.8 SUITE=phpunit"
2226
# Other databases, only highest php supported
27+
- "PHP=8.0 DB=mssql GIT=MOODLE_311_STABLE SUITE=phpunit"
2328
- "PHP=7.4 DB=mssql GIT=v3.10.0 SUITE=phpunit"
2429
- "PHP=7.4 DB=mssql GIT=v3.9.1 SUITE=phpunit"
2530
- "PHP=7.4 DB=mssql GIT=v3.8.4 SUITE=phpunit"
2631
- "PHP=7.2 DB=mssql GIT=v3.5.8 SUITE=phpunit"
32+
- "PHP=8.0 DB=mysql GIT=MOODLE_311_STABLE SUITE=phpunit"
2733
- "PHP=7.4 DB=mysql GIT=v3.10.0 SUITE=phpunit"
2834
- "PHP=7.4 DB=mysql GIT=v3.9.1 SUITE=phpunit"
2935
- "PHP=7.4 DB=mysql GIT=v3.8.4 SUITE=phpunit"
3036
- "PHP=7.2 DB=mysql GIT=v3.5.8 SUITE=phpunit"
37+
- "PHP=8.0 DB=oracle GIT=MOODLE_311_STABLE SUITE=phpunit"
3138
- "PHP=7.4 DB=oracle GIT=v3.10.0 SUITE=phpunit"
3239
- "PHP=7.4 DB=oracle GIT=v3.9.1 SUITE=phpunit"
3340
- "PHP=7.4 DB=oracle GIT=v3.8.4 SUITE=phpunit"
3441
- "PHP=7.2 DB=oracle GIT=v3.5.8 SUITE=phpunit"
3542
# MariaDB, only lowest php supported
43+
- "PHP=7.3 DB=mariadb GIT=MOODLE_311_STABLE SUITE=phpunit"
3644
- "PHP=7.2 DB=mariadb GIT=v3.10.0 SUITE=phpunit"
3745
- "PHP=7.2 DB=mariadb GIT=v3.9.1 SUITE=phpunit"
3846
- "PHP=7.1 DB=mariadb GIT=v3.8.4 SUITE=phpunit"
3947
- "PHP=7.0 DB=mariadb GIT=v3.5.8 SUITE=phpunit"
4048
# behat
4149
# PostgreSQL highest, lowest (2 browsers)
42-
- "PHP=7.4 DB=pgsql GIT=master SUITE=behat BROWSER=chrome"
43-
- "PHP=7.4 DB=pgsql GIT=master SUITE=behat BROWSER=firefox"
50+
- "PHP=8.0 DB=pgsql GIT=master SUITE=behat BROWSER=chrome"
51+
- "PHP=8.0 DB=pgsql GIT=master SUITE=behat BROWSER=firefox"
4452
- "PHP=7.3 DB=pgsql GIT=master SUITE=behat BROWSER=chrome"
4553
- "PHP=7.3 DB=pgsql GIT=master SUITE=behat BROWSER=firefox"
46-
- "PHP=7.4 DB=pgsql GIT=MOODLE_311_STABLE SUITE=behat BROWSER=chrome"
47-
- "PHP=7.4 DB=pgsql GIT=MOODLE_311_STABLE SUITE=behat BROWSER=firefox"
54+
- "PHP=8.0 DB=pgsql GIT=MOODLE_311_STABLE SUITE=behat BROWSER=chrome"
55+
- "PHP=8.0 DB=pgsql GIT=MOODLE_311_STABLE SUITE=behat BROWSER=firefox"
4856
- "PHP=7.3 DB=pgsql GIT=MOODLE_311_STABLE SUITE=behat BROWSER=chrome"
4957
- "PHP=7.3 DB=pgsql GIT=MOODLE_311_STABLE SUITE=behat BROWSER=firefox"
5058
- "PHP=7.4 DB=pgsql GIT=v3.10.0 SUITE=behat BROWSER=chrome"
@@ -64,26 +72,32 @@ env:
6472
- "PHP=7.0 DB=pgsql GIT=v3.5.8 SUITE=behat BROWSER=chrome"
6573
- "PHP=7.0 DB=pgsql GIT=v3.5.8 SUITE=behat BROWSER=firefox"
6674
# Other databases, only highest php supported (1 browsers)
75+
- "PHP=8.0 DB=mssql GIT=MOODLE_311_STABLE SUITE=behat BROWSER=chrome"
6776
- "PHP=7.4 DB=mssql GIT=v3.10.0 SUITE=behat BROWSER=firefox"
6877
- "PHP=7.4 DB=mssql GIT=v3.9.1 SUITE=behat BROWSER=chrome"
6978
- "PHP=7.4 DB=mssql GIT=v3.8.4 SUITE=behat BROWSER=firefox"
7079
- "PHP=7.2 DB=mssql GIT=v3.5.8 SUITE=behat BROWSER=chrome"
80+
- "PHP=8.0 DB=mysql GIT=MOODLE_311_STABLE SUITE=behat BROWSER=chrome"
7181
- "PHP=7.4 DB=mysql GIT=v3.10.0 SUITE=behat BROWSER=firefox"
7282
- "PHP=7.4 DB=mysql GIT=v3.9.1 SUITE=behat BROWSER=chrome"
7383
- "PHP=7.4 DB=mysql GIT=v3.8.4 SUITE=behat BROWSER=firefox"
7484
- "PHP=7.2 DB=mysql GIT=v3.5.8 SUITE=behat BROWSER=chrome"
85+
- "PHP=8.0 DB=oracle GIT=MOODLE_311_STABLE SUITE=behat BROWSER=chrome"
7586
- "PHP=7.4 DB=oracle GIT=v3.10.0 SUITE=behat BROWSER=firefox"
7687
- "PHP=7.4 DB=oracle GIT=v3.9.1 SUITE=behat BROWSER=chrome"
7788
- "PHP=7.4 DB=oracle GIT=v3.8.4 SUITE=behat BROWSER=firefox"
7889
- "PHP=7.2 DB=oracle GIT=v3.5.8 SUITE=behat BROWSER=chrome"
7990
# MariaDB, only lowest php supported (1 browsers)
91+
- "PHP=7.3 DB=mariadb GIT=MOODLE_311_STABLE SUITE=behat BROWSER=firefox"
8092
- "PHP=7.2 DB=mariadb GIT=v3.10.0 SUITE=behat BROWSER=chrome"
8193
- "PHP=7.2 DB=mariadb GIT=v3.9.1 SUITE=behat BROWSER=firefox"
8294
- "PHP=7.2 DB=mariadb GIT=v3.8.4 SUITE=behat BROWSER=chrome"
8395
- "PHP=7.0 DB=mariadb GIT=v3.5.8 SUITE=behat BROWSER=firefox"
84-
# Mobile app
85-
- "PHP=7.4 DB=pgsql GIT=master SUITE=behat-app-development BROWSER=chrome APP_VERSION=3.9.0 APP_PATH=$HOME/app"
86-
- "PHP=7.4 DB=pgsql GIT=master SUITE=behat-app BROWSER=chrome APP_VERSION=3.9.0"
96+
# Mobile app, highest, lowest
97+
- "PHP=8.0 DB=pgsql GIT=master SUITE=behat-app-development BROWSER=chrome APP_VERSION=3.9.0 APP_PATH=$HOME/app"
98+
- "PHP=8.0 DB=pgsql GIT=master SUITE=behat-app BROWSER=chrome APP_VERSION=3.9.0"
99+
- "PHP=7.3 DB=pgsql GIT=master SUITE=behat-app-development BROWSER=chrome APP_VERSION=3.9.0 APP_PATH=$HOME/app"
100+
- "PHP=7.3 DB=pgsql GIT=master SUITE=behat-app BROWSER=chrome APP_VERSION=3.9.0"
87101
install:
88102
- git clone --branch $GIT --depth 1 git://github.com/moodle/moodle $HOME/moodle
89103
- cp config.docker-template.php $HOME/moodle/config.php

‎tests/test.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ basedir="$( cd "$( dirname "${BASH_SOURCE[0]}" )/../" && pwd )"
55

66
if [ "$SUITE" = "phpunit" ];
77
then
8-
testcmd="bin/moodle-docker-compose exec -T webserver vendor/bin/phpunit core_dml_testcase lib/dml/tests/dml_test.php"
8+
testcmd="bin/moodle-docker-compose exec -T webserver vendor/bin/phpunit --filter core_dml_testcase"
99
elif [ "$SUITE" = "behat" ];
1010
then
1111
testcmd="bin/moodle-docker-compose exec -T webserver php admin/tool/behat/cli/run.php --tags=@auth_manual"

0 commit comments

Comments
 (0)