summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2019-12-06 13:27:41 -0800
committerAlessio Caiazza <acaiazza@gitlab.com>2019-12-13 17:05:56 +0100
commit7fae3ce59446aaf8bfae0788934ff5a0ee71bfce (patch)
tree80a836ba976f89b3570493cb19acbb89677f64ea
parentfe022014e790b221f49a96dde5d5b7dfb4bf10bc (diff)
downloadgitlab-ce-7fae3ce59446aaf8bfae0788934ff5a0ee71bfce.tar.gz
Simplify static-analysis output generation
The buffering of the output may be causing issues, so let's disable it for now.
-rwxr-xr-xscripts/static-analysis61
1 files changed, 8 insertions, 53 deletions
diff --git a/scripts/static-analysis b/scripts/static-analysis
index 642c50ec0a8..0972fe081f5 100755
--- a/scripts/static-analysis
+++ b/scripts/static-analysis
@@ -4,27 +4,6 @@
require_relative '../lib/gitlab/popen'
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 warning(s):"
- puts
- puts result.stderr
- puts
- end
-end
-
-def emit_errors(static_analysis)
- static_analysis.failed_results.each do |result|
- puts
- puts "**** #{result.cmd.join(' ')} failed with the following error(s):"
- puts
- puts result.stdout
- puts result.stderr
- puts
- end
-end
-
tasks = [
%w[bin/rake lint:all],
%w[bundle exec license_finder],
@@ -36,37 +15,13 @@ tasks = [
%w[scripts/lint-rugged]
]
-static_analysis = Gitlab::Popen::Runner.new
-
-static_analysis.run(tasks) do |cmd, &run|
- puts
- puts "$ #{cmd.join(' ')}"
-
- result = run.call
+tasks.each do |task|
+ cmd = task.join(' ')
+ puts "$ #{cmd}"
+ result = system(cmd)
- puts "==> Finished in #{result.duration} seconds"
- puts
-end
-
-puts
-puts '==================================================='
-puts
-puts
-
-if static_analysis.all_success_and_clean?
- puts 'All static analyses passed successfully.'
-elsif static_analysis.all_success?
- puts 'All static analyses passed successfully, but we have warnings:'
- puts
-
- emit_warnings(static_analysis)
-
- exit 2
-else
- puts 'Some static analyses failed:'
-
- emit_warnings(static_analysis)
- emit_errors(static_analysis)
-
- exit 1
+ unless result
+ puts "#{cmd} failed!"
+ exit 1
+ end
end