Merge branch 'MDL-73018-M401_bump-travis-and-gha-to-use-php81-instead-of-php80' of https://github.com/ziegenberg/moodle into MOODLE_401_STABLE

This commit is contained in:
Andrew Nicols 2023-02-28 23:03:08 +08:00
commit bac48ffee3
2 changed files with 7 additions and 7 deletions

View File

@ -9,7 +9,7 @@ on:
- v[0-9]+.[0-9]+.[0-9]+*
env:
php: 8.0
php: 8.1
jobs:
Grunt:
@ -59,7 +59,7 @@ jobs:
extensions:
db: mysqli
- os: ubuntu-22.04
php: 8.0
php: 8.1
db: pgsql
steps:

View File

@ -50,20 +50,20 @@ jobs:
php: 7.4
env: DB=mysqli TASK=PHPUNIT
# Then, conditionally, all the highest php ones (8.0)
# Then, conditionally, all the highest php ones (8.1)
- if: env(MOODLE_PHP) = "all"
php: 8.0
php: 8.1
env: DB=none TASK=CITEST
- if: env(MOODLE_PHP) = "all"
php: 8.0
php: 8.1
env: DB=none TASK=GRUNT
- if: env(MOODLE_PHP) = "all" AND (env(MOODLE_DATABASE) = "pgsql" OR env(MOODLE_DATABASE) = "all" OR env(MOODLE_DATABASE) IS NOT present)
php: 8.0
php: 8.1
env: DB=pgsql TASK=PHPUNIT
- if: env(MOODLE_PHP) = "all" AND (env(MOODLE_DATABASE) = "mysqli" OR env(MOODLE_DATABASE) = "all")
php: 8.0
php: 8.1
env: DB=mysqli TASK=PHPUNIT
cache: