From 093cab2db04675dc9f9ccc52a3ceee5f85156f45 Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Mon, 22 Oct 2018 21:28:38 +0100
Subject: [PATCH] DEV: Lint official plugins in CI (#6519)

---
 .travis.yml           | 1 +
 lib/tasks/docker.rake | 9 +++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 29b6d0fd7ac..4e2e7df725a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -76,6 +76,7 @@ script:
       if [ '$RUN_LINT' == '1' ]; then
         bundle exec rubocop --parallel && \
         bundle exec danger && \
+        yarn prettier --list-different "plugins/**/*.scss" "plugins/**/*.es6" \
         yarn eslint --ext .es6 app/assets/javascripts && \
         yarn eslint --ext .es6 test/javascripts && \
         yarn eslint --ext .es6 plugins/**/assets/javascripts && \
diff --git a/lib/tasks/docker.rake b/lib/tasks/docker.rake
index 65276b759c4..8689aa21731 100644
--- a/lib/tasks/docker.rake
+++ b/lib/tasks/docker.rake
@@ -38,6 +38,11 @@ desc 'Run all tests (JS and code in a standalone environment)'
 task 'docker:test' do
   begin
     @good = true
+
+    if ENV["INSTALL_OFFICIAL_PLUGINS"]
+      @good &&= run_or_fail("bundle exec rake plugin:install_all_official")
+    end
+
     unless ENV['SKIP_LINT']
       puts "travis_fold:start:lint" if ENV["TRAVIS"]
       puts "Running linters/prettyfiers"
@@ -91,10 +96,6 @@ task 'docker:test' do
 
       @good &&= run_or_fail("bundle exec rake db:create")
 
-      if ENV["INSTALL_OFFICIAL_PLUGINS"]
-        @good &&= run_or_fail("bundle exec rake plugin:install_all_official")
-      end
-
       if ENV["SKIP_PLUGINS"]
         @good &&= run_or_fail("bundle exec rake db:migrate")
       else