From 90802053a0dcfcd3a94759fad35d2f1bb029fd0b Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <tgx_world@hotmail.com>
Date: Thu, 30 Aug 2018 16:04:56 +0800
Subject: [PATCH] Fix linting on Travis for stable.

---
 .travis.yml | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 16ccc5722be..eb5f8087fe5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,6 +8,7 @@ branches:
 
 env:
   global:
+    - TRAVIS_NODE_VERSION="10"
     - DISCOURSE_HOSTNAME=www.example.com
     - RUBY_GLOBAL_METHOD_CACHE_SIZE=131072
   matrix:
@@ -46,6 +47,8 @@ cache:
     - vendor/bundle
 
 before_install:
+  - nvm install node
+  - node --version
   - gem install bundler
   - git clone --depth=1 https://github.com/discourse/discourse-backup-uploads-to-s3.git plugins/discourse-backup-uploads-to-s3
   - git clone --depth=1 https://github.com/discourse/discourse-spoiler-alert.git plugins/discourse-spoiler-alert
@@ -60,8 +63,7 @@ before_install:
 install:
   - bash -c "if [ '$RAILS_MASTER' == '1' ]; then bundle update --retry=3 --jobs=3 arel rails seed-fu > /dev/null; fi"
   - bash -c "if [ '$RAILS_MASTER' == '0' ]; then bundle install --without development --deployment --retry=3 --jobs=3 > /dev/null; fi"
-  - bash -c "if [ '$RUN_LINT' == '1' ]; then yarn global add eslint babel-eslint > /dev/null; fi"
-  - bash -c "if [ '$QUNIT_RUN' == '1' ]; then yarn install --dev > /dev/null; fi"
+  - bash -c "if [ '$QUNIT_RUN' == '1' ] || [ '$RUN_LINT' == '1' ]; then yarn install --dev > /dev/null; fi"
   - bash -c "if [ '$RUN_LINT' != '1' ]; then bundle exec rake db:create db:migrate > /dev/null; fi"
 
 script:
@@ -69,11 +71,11 @@ script:
     bash -c "
       if [ '$RUN_LINT' == '1' ]; then
         bundle exec rubocop --parallel && \
-        eslint --ext .es6 app/assets/javascripts && \
-        eslint --ext .es6 test/javascripts && \
-        eslint --ext .es6 plugins/**/assets/javascripts && \
-        eslint --ext .es6 plugins/**/test/javascripts && \
-        eslint app/assets/javascripts test/javascripts
+        yarn eslint --ext .es6 app/assets/javascripts && \
+        yarn eslint --ext .es6 test/javascripts && \
+        yarn eslint --ext .es6 plugins/**/assets/javascripts && \
+        yarn eslint --ext .es6 plugins/**/test/javascripts && \
+        yarn eslint app/assets/javascripts test/javascripts
       else
         if [ '$QUNIT_RUN' == '1' ]; then
           bundle exec rake qunit:test['500000'] && \