diff --git a/.travis.yml b/.travis.yml index 4e2e7df725a..29b6d0fd7ac 100644 --- a/.travis.yml +++ b/.travis.yml @@ -76,7 +76,6 @@ 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 8689aa21731..65276b759c4 100644 --- a/lib/tasks/docker.rake +++ b/lib/tasks/docker.rake @@ -38,11 +38,6 @@ 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" @@ -96,6 +91,10 @@ 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