From ef95f5262fec31bd9c3eebda9cdcd0f2a4100d29 Mon Sep 17 00:00:00 2001 From: "Eloy Lafuente (stronk7)" Date: Mon, 23 Nov 2020 13:40:52 +0100 Subject: [PATCH] MDL-70265 travis: Completely remove the UPGRADE check It was broken since ages ago, see MDL-64874, so no sense to keep it eating minutes for nothing. --- .travis.yml | 61 +---------------------------------------------------- 1 file changed, 1 insertion(+), 60 deletions(-) diff --git a/.travis.yml b/.travis.yml index 35f0a786567..1e735a51fe5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -36,18 +36,10 @@ jobs: php: 7.2 env: DB=pgsql TASK=PHPUNIT - - if: env(MOODLE_DATABASE) = "pgsql" OR env(MOODLE_DATABASE) = "all" OR env(MOODLE_DATABASE) IS NOT present - php: 7.2 - env: DB=pgsql TASK=UPGRADE - - if: env(MOODLE_DATABASE) = "mysqli" OR env(MOODLE_DATABASE) = "all" php: 7.2 env: DB=mysqli TASK=PHPUNIT - - if: env(MOODLE_DATABASE) = "mysqli" OR env(MOODLE_DATABASE) = "all" - php: 7.2 - env: DB=mysqli TASK=UPGRADE - # Then, conditionally, all the highest php ones (7.4) - if: env(MOODLE_PHP) = "all" php: 7.4 @@ -60,18 +52,10 @@ jobs: php: 7.4 env: DB=pgsql TASK=PHPUNIT - - 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 - env: DB=pgsql TASK=UPGRADE - - if: env(MOODLE_PHP) = "all" AND (env(MOODLE_DATABASE) = "mysqli" OR env(MOODLE_DATABASE) = "all") php: 7.4 env: DB=mysqli TASK=PHPUNIT - - if: env(MOODLE_PHP) = "all" AND (env(MOODLE_DATABASE) = "mysqli" OR env(MOODLE_DATABASE) = "all") - php: 7.4 - env: DB=mysqli TASK=UPGRADE - cache: directories: - $HOME/.composer/cache @@ -130,7 +114,7 @@ install: before_script: - phpenv config-rm xdebug.ini - > - if [ "$TASK" = 'PHPUNIT' -o "$TASK" = 'UPGRADE' ]; + if [ "$TASK" = 'PHPUNIT' ]; then # Copy generic configuration in place. cp config-dist.php config.php ; @@ -241,32 +225,6 @@ before_script: export phpcmd=`which php`; fi - ######################################################################## - # Upgrade test - ######################################################################## - - > - if [ "$TASK" = 'UPGRADE' ]; - then - # We need the official upstream. - git remote add upstream https://github.com/moodle/moodle.git; - - # Checkout 30 STABLE branch (the first version compatible with PHP 7.x) - git fetch upstream MOODLE_30_STABLE; - git checkout MOODLE_30_STABLE; - - # Perform the upgrade - php admin/cli/install_database.php --agree-license --adminpass=Password --adminemail=admin@example.com --fullname="Upgrade test" --shortname=Upgrade; - - # Return to the previous commit - git checkout -; - - # Perform the upgrade - php admin/cli/upgrade.php --non-interactive --allow-unstable ; - - # The local_ci repository can be used to check upgrade savepoints. - git clone https://github.com/moodlehq/moodle-local_ci.git local/ci ; - fi - script: - > if [ "$TASK" = 'PHPUNIT' ]; @@ -292,23 +250,6 @@ script: git diff --cached --exit-code ; fi - ######################################################################## - # Upgrade test - ######################################################################## - - > - if [ "$TASK" = 'UPGRADE' ]; - then - cp local/ci/check_upgrade_savepoints/check_upgrade_savepoints.php ./check_upgrade_savepoints.php - result=`php check_upgrade_savepoints.php`; - # Check if there are problems - count=`echo "$result" | grep -P "ERROR|WARN" | wc -l` ; - if (($count > 0)); - then - echo "$result" - exit 1 ; - fi - fi - after_script: - > if [ "$TASK" = 'PHPUNIT' ];