From 20258deb2039d44dfe8882dbb30474ce3df068b1 Mon Sep 17 00:00:00 2001 From: Mikhail Golenkov Date: Mon, 3 Feb 2020 17:42:11 +1100 Subject: [PATCH 1/2] Update Travis matrix #176. --- .travis.yml | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 27c038f..31e99bc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,19 +23,27 @@ php: env: - DB=pgsql MOODLE_BRANCH=master - DB=mysqli MOODLE_BRANCH=master + - DB=pgsql MOODLE_BRANCH=MOODLE_38_STABLE + - DB=mysqli MOODLE_BRANCH=MOODLE_38_STABLE - DB=pgsql MOODLE_BRANCH=MOODLE_37_STABLE + - DB=mysqli MOODLE_BRANCH=MOODLE_37_STABLE + - DB=pgsql MOODLE_BRANCH=MOODLE_36_STABLE - DB=mysqli MOODLE_BRANCH=MOODLE_36_STABLE matrix: include: + - php: 7.1 + env: DB=pgsql MOODLE_BRANCH=MOODLE_35_STABLE + - php: 7.1 + env: DB=mysqli MOODLE_BRANCH=MOODLE_35_STABLE + - php: 7.0 + env: DB=pgsql MOODLE_BRANCH=MOODLE_34_STABLE + - php: 7.0 + env: DB=mysqli MOODLE_BRANCH=MOODLE_34_STABLE - php: 5.6 env: DB=pgsql MOODLE_BRANCH=MOODLE_33_STABLE - php: 5.6 env: DB=mysqli MOODLE_BRANCH=MOODLE_33_STABLE - - php: 7.0 - env: DB=pgsql MOODLE_BRANCH=MOODLE_34_STABLE - - php: 7.1 - env: DB=mysqli MOODLE_BRANCH=MOODLE_35_STABLE before_install: - phpenv config-rm xdebug.ini From de958edc9f00d2d5bbd460bae52b523357d632ff Mon Sep 17 00:00:00 2001 From: Mikhail Golenkov Date: Mon, 3 Feb 2020 17:43:13 +1100 Subject: [PATCH 2/2] Use postgresql 9.5 for 3.8 and master branch #176. --- .travis.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 31e99bc..6ff61a9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,8 +9,7 @@ addons: packages: - openjdk-8-jre -services: - - mysql +dist: trusty cache: directories: @@ -46,6 +45,11 @@ matrix: env: DB=mysqli MOODLE_BRANCH=MOODLE_33_STABLE before_install: + - export MOODLE_VERSION=$(echo "$MOODLE_BRANCH" | cut -d'_' -f 2) + - if [ ${TRAVIS_PHP_VERSION:0:3} == "7.2" ] && [ $DB == "pgsql" ] && [[ "$MOODLE_VERSION" -gt 38 || "$MOODLE_VERSION" == "master" ]] ; then + sudo /etc/init.d/postgresql stop; + sudo /etc/init.d/postgresql start 9.5; + fi - phpenv config-rm xdebug.ini - nvm install 8.9 - nvm use 8.9