Merge remote-tracking branch 'upstream/master'

1 files changed, 32 insertions, 10 deletions

diff --git a/.travis.yml b/.travis.yml
index 1b2bf97b..eee1ca74 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,23 +1,45 @@
 sudo: false
 dist: trusty
-language: php
+
+matrix:
+  include:
+    - language: php
+      php: 7.2
+    - language: php
+      php: 7.1
+    - language: php
+      php: 7.0
+    - language: php
+      php: 5.6
+    - language: node_js
+      node_js: 8
+      cache:
+        yarn: true
+        directories:
+          - $HOME/.cache/yarn
+
+      install:
+        - yarn install
+
+      before_script:
+        - PATH=${PATH//:\.\/node_modules\/\.bin/}
+
+      script:
+        - yarn run build # Just to be sure that the build isn't broken
+        - make eslint
+        - make sasslint
+
 cache:
-  yarn: true
   directories:
     - $HOME/.composer/cache
-    - $HOME/.cache/yarn
-php:
-  - 7.2
-  - 7.1
-  - 7.0
-  - 5.6
+
 install:
-  - yarn install
   - composer install --prefer-dist
+
 before_script:
   - PATH=${PATH//:\.\/node_modules\/\.bin/}
+
 script:
   - make clean
   - make check_permissions
-  - make eslint
   - make all_tests