Add cache to the 'compile-assets' and 'gitlab:assets:compile' jobs

Signed-off-by: Rémy Coutable <remy@rymai.me>

5 files changed, 24 insertions, 8 deletions

diff --git a/lib/gitlab/task_helpers.rb b/lib/gitlab/task_helpers.rb
index 224bb648d8f..8532845f3cb 100644
--- a/lib/gitlab/task_helpers.rb
+++ b/lib/gitlab/task_helpers.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'rainbow/ext/string'
-require 'gitlab/utils/strong_memoize'
+require_dependency 'gitlab/utils/strong_memoize'
 
 # rubocop:disable Rails/Output
 module Gitlab
@@ -13,6 +13,12 @@ module Gitlab
 
     extend self
 
+    def invoke_and_time_task(task)
+      start = Time.now
+      Rake::Task[task].invoke
+      puts "`#{task}` finished in #{Time.now - start} seconds"
+    end
+
     # Ask if the user wants to continue
     #
     # Returns "yes" the user chose to continue
diff --git a/lib/gitlab/utils/merge_hash.rb b/lib/gitlab/utils/merge_hash.rb
index fc237861e2f..48ba13b8561 100644
--- a/lib/gitlab/utils/merge_hash.rb
+++ b/lib/gitlab/utils/merge_hash.rb
@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require_dependency 'gitlab/utils'
+
 module Gitlab
   module Utils
     module MergeHash
diff --git a/lib/gitlab/utils/override.rb b/lib/gitlab/utils/override.rb
index c87e97d0213..f5299439fce 100644
--- a/lib/gitlab/utils/override.rb
+++ b/lib/gitlab/utils/override.rb
@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require_dependency 'gitlab/utils'
+
 module Gitlab
   module Utils
     module Override
diff --git a/lib/gitlab/utils/strong_memoize.rb b/lib/gitlab/utils/strong_memoize.rb
index aa1f8e2fdda..3021a91dd83 100644
--- a/lib/gitlab/utils/strong_memoize.rb
+++ b/lib/gitlab/utils/strong_memoize.rb
@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require_dependency 'gitlab/utils'
+
 module Gitlab
   module Utils
     module StrongMemoize
diff --git a/lib/tasks/gitlab/assets.rake b/lib/tasks/gitlab/assets.rake
index a42f02a84fd..7a42e4e92a0 100644
--- a/lib/tasks/gitlab/assets.rake
+++ b/lib/tasks/gitlab/assets.rake
@@ -1,13 +1,17 @@
 namespace :gitlab do
   namespace :assets do
     desc 'GitLab | Assets | Compile all frontend assets'
-    task compile: [
-      'yarn:check',
-      'gettext:po_to_json',
-      'rake:assets:precompile',
-      'webpack:compile',
-      'fix_urls'
-    ]
+    task :compile do
+      require_dependency 'gitlab/task_helpers'
+
+      %w[
+        yarn:check
+        gettext:po_to_json
+        rake:assets:precompile
+        webpack:compile
+        gitlab:assets:fix_urls
+      ].each(&Gitlab::TaskHelpers.method(:invoke_and_time_task))
+    end
 
     desc 'GitLab | Assets | Clean up old compiled frontend assets'
     task clean: ['rake:assets:clean']