From d4caf69ed7ab43c776fef38906fe828ae33e81b6 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Fri, 5 Jun 2020 17:59:23 +0200
Subject: [PATCH] DEV: makes SKIP_INSTALL_PLUGINS called last and global
 (#9990)

---
 lib/tasks/docker.rake | 7 +++++++
 lib/tasks/plugin.rake | 4 ----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/lib/tasks/docker.rake b/lib/tasks/docker.rake
index fb706a8f6f1..47af6ba468d 100644
--- a/lib/tasks/docker.rake
+++ b/lib/tasks/docker.rake
@@ -134,6 +134,13 @@ task 'docker:test' do
         @good &&= run_or_fail("bundle exec rake plugin:update_all")
       end
 
+      if skip_install = ENV["SKIP_INSTALL_PLUGINS"]
+        skip_install.split(",").map(&:strip).each do |plugin|
+          puts "[SKIP_INSTALL_PLUGINS] Removing #{plugin}"
+          `rm -fr plugins/#{plugin}`
+        end
+      end
+
       command_prefix =
         if ENV["SKIP_PLUGINS"]
           # Make sure not to load plugins. bin/rake will add LOAD_PLUGINS=1 automatically unless we set it to 0 explicitly
diff --git a/lib/tasks/plugin.rake b/lib/tasks/plugin.rake
index 693f7ef8179..9da1f433506 100644
--- a/lib/tasks/plugin.rake
+++ b/lib/tasks/plugin.rake
@@ -11,10 +11,6 @@ task 'plugin:install_all_official' do
     'poll'
   ])
 
-  if skip_install = ENV["SKIP_INSTALL_PLUGINS"]
-    skip_install.split(",").map(&:strip).each { |plugin| skip << plugin  }
-  end
-
   map = {
     'Canned Replies' => 'https://github.com/discourse/discourse-canned-replies',
     'discourse-perspective' => 'https://github.com/discourse/discourse-perspective-api'