From e4990b66df64f2e23502d161f411335c9a771a43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Coutable?= <remy@rymai.me>
Date: Fri, 26 Jan 2018 15:23:46 +0100
Subject: Combine all rake tasks in the static-analysis job
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Rémy Coutable <remy@rymai.me>
---
 lib/tasks/lint.rake     | 28 ++++++++++++++++++++++++++++
 scripts/static-analysis |  7 +------
 2 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/lib/tasks/lint.rake b/lib/tasks/lint.rake
index 3ab406eff2c..e7812ff3568 100644
--- a/lib/tasks/lint.rake
+++ b/lib/tasks/lint.rake
@@ -16,5 +16,33 @@ unless Rails.env.production?
     task :javascript do
       Rake::Task['eslint'].invoke
     end
+
+    desc "GitLab | lint | Run several lint checks"
+    task :all do
+      status = 0
+      original_stdout = $stdout
+
+      %w[
+        config_lint
+        haml_lint
+        scss_lint
+        flay
+        gettext:lint
+        lint:static_verification
+      ].each do |task|
+        begin
+          $stdout = StringIO.new
+          Rake::Task[task].invoke
+        rescue RuntimeError, SystemExit => ex
+          raise ex if ex.is_a?(RuntimeError) && task != 'haml_lint'
+          original_stdout << $stdout.string
+          status = 1
+        ensure
+          $stdout = original_stdout
+        end
+      end
+
+      exit status
+    end
   end
 end
diff --git a/scripts/static-analysis b/scripts/static-analysis
index bdb88f3cb57..db4df4ee6cb 100755
--- a/scripts/static-analysis
+++ b/scripts/static-analysis
@@ -26,15 +26,10 @@ def emit_errors(static_analysis)
 end
 
 tasks = [
-  %w[bundle exec rake config_lint],
-  %w[bundle exec rake flay],
-  %w[bundle exec rake haml_lint],
-  %w[bundle exec rake scss_lint],
+  %w[bin/rake lint:all],
   %w[bundle exec license_finder],
   %w[yarn run eslint],
   %w[bundle exec rubocop --parallel],
-  %w[bundle exec rake gettext:lint],
-  %w[bundle exec rake lint:static_verification],
   %w[scripts/lint-conflicts.sh],
   %w[scripts/lint-rugged]
 ]
-- 
cgit v1.2.1


From 2f0d2ab55b6deac79f81834f6724a676ceae94ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Coutable?= <remy@rymai.me>
Date: Mon, 12 Feb 2018 18:34:07 +0100
Subject: Run lint:all tasks in forks
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Rémy Coutable <remy@rymai.me>
---
 lib/tasks/lint.rake     | 43 ++++++++++++++++++++++++++++++++-----------
 scripts/static-analysis |  4 ++--
 2 files changed, 34 insertions(+), 13 deletions(-)

diff --git a/lib/tasks/lint.rake b/lib/tasks/lint.rake
index e7812ff3568..fe5032cae18 100644
--- a/lib/tasks/lint.rake
+++ b/lib/tasks/lint.rake
@@ -20,7 +20,6 @@ unless Rails.env.production?
     desc "GitLab | lint | Run several lint checks"
     task :all do
       status = 0
-      original_stdout = $stdout
 
       %w[
         config_lint
@@ -30,19 +29,41 @@ unless Rails.env.production?
         gettext:lint
         lint:static_verification
       ].each do |task|
-        begin
-          $stdout = StringIO.new
-          Rake::Task[task].invoke
-        rescue RuntimeError, SystemExit => ex
-          raise ex if ex.is_a?(RuntimeError) && task != 'haml_lint'
-          original_stdout << $stdout.string
-          status = 1
-        ensure
-          $stdout = original_stdout
+        pid = Process.fork do
+          rd, wr = IO.pipe
+          stdout = $stdout.dup
+          stderr = $stderr.dup
+          $stdout.reopen(wr)
+          $stderr.reopen(wr)
+
+          begin
+            begin
+              Rake::Task[task].invoke
+            rescue RuntimeError # The haml_lint tasks raise a RuntimeError
+              exit(1)
+            end
+          rescue SystemExit => ex
+            msg = "*** Rake task #{task} failed with the following error(s):"
+            raise ex
+          ensure
+            $stdout.reopen(stdout)
+            $stderr.reopen(stderr)
+            wr.close
+
+            if msg
+              warn "\n#{msg}\n\n"
+              IO.copy_stream(rd, $stderr)
+            else
+              IO.copy_stream(rd, $stdout)
+            end
+          end
         end
+
+        Process.waitpid(pid)
+        status += $?.exitstatus
       end
 
-      exit status
+      exit(status)
     end
   end
 end
diff --git a/scripts/static-analysis b/scripts/static-analysis
index db4df4ee6cb..0e67eabfec1 100755
--- a/scripts/static-analysis
+++ b/scripts/static-analysis
@@ -7,7 +7,7 @@ require_relative '../lib/gitlab/popen/runner'
 def emit_warnings(static_analysis)
   static_analysis.warned_results.each do |result|
     puts
-    puts "**** #{result.cmd.join(' ')} had the following warnings:"
+    puts "**** #{result.cmd.join(' ')} had the following warning(s):"
     puts
     puts result.stderr
     puts
@@ -17,7 +17,7 @@ end
 def emit_errors(static_analysis)
   static_analysis.failed_results.each do |result|
     puts
-    puts "**** #{result.cmd.join(' ')} failed with the following error:"
+    puts "**** #{result.cmd.join(' ')} failed with the following error(s):"
     puts
     puts result.stdout
     puts result.stderr
-- 
cgit v1.2.1