From bf33d00fbe64de184c23d233f36d20167f65a0dd Mon Sep 17 00:00:00 2001
From: Dmitrii Metelkin <dmitriim@catalyst-au.net>
Date: Mon, 29 Jan 2018 11:40:20 +1100
Subject: [PATCH] Simplify travis file

---
 .travis.yml | 42 ++++++++++++++++--------------------------
 1 file changed, 16 insertions(+), 26 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 772ec92..31b1ce2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,40 +1,30 @@
 language: php
 
+notifications:
+  email:
+    recipients:
+    - dmitriim@catalyst-au.net
+
+sudo: false
+
 cache:
   directories:
     - $HOME/.composer/cache
 
 php:
-  - 5.6
   - 7.0
+  - 7.1
 
 addons:
   postgresql: "9.3"
 
 env:
-  global:
-    - DB=pgsql # There is not enough database usage to justify full check with mysqli too.
-  matrix:
-    - MOODLE_BRANCH=MOODLE_30_STABLE
-    - MOODLE_BRANCH=MOODLE_31_STABLE
-    - MOODLE_BRANCH=MOODLE_32_STABLE
-    - MOODLE_BRANCH=MOODLE_33_STABLE
-    - MOODLE_BRANCH=master
-
-matrix:
-  include:
-    # Test old Moodle in PHP 5.6 only
-    - php: 5.6
-      env: MOODLE_BRANCH=MOODLE_29_STABLE
-    # Test MySQL
-    - php: 7.0
-      env: DB=mysqli MOODLE_BRANCH=master
-    # Test PHP 7.1
-    - php: 7.1
-      env: MOODLE_BRANCH=master
-  exclude:
-    - php: 5.6
-      env: MOODLE_BRANCH=master
+  - DB=pgsql MOODLE_BRANCH=MOODLE_33_STABLE
+  - DB=pgsql MOODLE_BRANCH=MOODLE_34_STABLE
+  - DB=pgsql MOODLE_BRANCH=master
+  - DB=mysqli MOODLE_BRANCH=MOODLE_33_STABLE
+  - DB=mysqli MOODLE_BRANCH=MOODLE_34_STABLE
+  - DB=mysqli MOODLE_BRANCH=master
 
 before_install:
   - cd ../..
@@ -43,12 +33,12 @@ before_install:
   - export PATH="$(cd ci/bin; pwd):$(cd ci/vendor/bin; pwd):$PATH"
 
 install:
-  - moodle-plugin-ci install -vvv
+  - moodle-plugin-ci install
 
 script:
+  - moodle-plugin-ci validate
   - moodle-plugin-ci phplint
   - moodle-plugin-ci codechecker
-  - moodle-plugin-ci validate
   - moodle-plugin-ci csslint
   - moodle-plugin-ci shifter
   - moodle-plugin-ci jshint