Merge branch 'MDL-70900' of https://github.com/stronk7/moodle
authorVíctor Déniz <victor@moodle.com>
Mon, 10 May 2021 21:47:13 +0000 (22:47 +0100)
committerVíctor Déniz <victor@moodle.com>
Mon, 10 May 2021 21:47:13 +0000 (22:47 +0100)
.github/workflows/push.yml
.travis.yml

index baac418..c85fd54 100644 (file)
@@ -9,7 +9,7 @@ on:
       - v[0-9]+.[0-9]+.[0-9]+*
 
 env:
-  php: 7.4
+  php: 8.0
 
 jobs:
   Grunt:
@@ -55,10 +55,12 @@ jobs:
         include:
           - os: ubuntu-18.04
             php: 7.3
+            extensions:
             db: mysqli
           - os: ubuntu-18.04
-            php: 7.4
+            php: 8.0
             db: pgsql
+            extensions: xmlrpc-beta
 
     steps:
       - name: Setting up DB mysql
@@ -88,6 +90,7 @@ jobs:
         uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php }}
+          extensions: ${{ matrix.extensions }}
           ini-values: max_input_vars=5000
           coverage: none
 
index 6d52469..40dd786 100644 (file)
@@ -46,20 +46,20 @@ jobs:
           php: 7.3
           env: DB=mysqli   TASK=PHPUNIT
 
-        # Then, conditionally, all the highest php ones (7.4)
+        # Then, conditionally, all the highest php ones (8.0)
         - if: env(MOODLE_PHP) = "all"
-          php: 7.4
+          php: 8.0
           env: DB=none     TASK=CITEST
         - if: env(MOODLE_PHP) = "all"
-          php: 7.4
+          php: 8.0
           env: DB=none     TASK=GRUNT    NVM_VERSION='lts/carbon'
 
         - if: env(MOODLE_PHP) = "all" AND (env(MOODLE_DATABASE) = "pgsql" OR env(MOODLE_DATABASE) = "all" OR env(MOODLE_DATABASE) IS NOT present)
-          php: 7.4
+          php: 8.0
           env: DB=pgsql    TASK=PHPUNIT
 
         - if: env(MOODLE_PHP) = "all" AND (env(MOODLE_DATABASE) = "mysqli" OR env(MOODLE_DATABASE) = "all")
-          php: 7.4
+          php: 8.0
           env: DB=mysqli   TASK=PHPUNIT
 
 cache:
@@ -118,6 +118,8 @@ install:
         fi
 
 before_script:
+    - if [[ ${TRAVIS_PHP_VERSION:0:1} -gt 7 ]]; then pecl install xmlrpc-beta; fi
+    - echo 'max_input_vars=5000' >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
     - phpenv config-rm xdebug.ini
     - >
       if [ "$TASK" = 'PHPUNIT' ];
@@ -187,10 +189,9 @@ before_script:
         sed -i \
           -e "/require_once/i \\define('TEST_CACHESTORE_REDIS_TESTSERVERS', '127.0.0.1');" \
           config.php ;
-        # Redis session tests, but not for PHP 7.2 and up. See MDL-60978 for more info.
-        redissession="define('TEST_SESSION_REDIS_HOST', '127.0.0.1');"
+        # Redis session tests
         sed -i \
-          -e "/require_once/i \\${redissession}" \
+          -e "/require_once/i \\define('TEST_SESSION_REDIS_HOST', '127.0.0.1');" \
           config.php ;
 
         # Initialise PHPUnit for Moodle.