From 96ee2ee661e799045001111e3a872e28e1ab9ee2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lvaro=20Brey?= Date: Fri, 6 May 2022 09:32:15 +0200 Subject: [PATCH] Fix spotbugs not failing builds when count increases MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit spotbugs-up now needs base branch, not target branch Signed-off-by: Álvaro Brey --- scripts/analysis/analysis-wrapper.sh | 4 ++-- scripts/analysis/spotbugs-up.rb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/analysis/analysis-wrapper.sh b/scripts/analysis/analysis-wrapper.sh index a81aab4b0e..6a071230e9 100755 --- a/scripts/analysis/analysis-wrapper.sh +++ b/scripts/analysis/analysis-wrapper.sh @@ -14,8 +14,8 @@ repository="android" ruby scripts/analysis/lint-up.rb $1 $2 $3 lintValue=$? -curl 2>/dev/null "https://www.kaminsky.me/nc-dev/$repository-findbugs/$stableBranch.xml" -o "/tmp/$stableBranch.xml" -ruby scripts/analysis/spotbugs-up.rb "$3" +curl "https://www.kaminsky.me/nc-dev/$repository-findbugs/$stableBranch.xml" -o "/tmp/$stableBranch.xml" +ruby scripts/analysis/spotbugs-up.rb "$stableBranch" spotbugsValue=$? # exit codes: diff --git a/scripts/analysis/spotbugs-up.rb b/scripts/analysis/spotbugs-up.rb index e9e960480f..ed046c4111 100644 --- a/scripts/analysis/spotbugs-up.rb +++ b/scripts/analysis/spotbugs-up.rb @@ -7,7 +7,7 @@ Encoding.default_internal = Encoding::UTF_8 puts "=================== starting Android Spotbugs Entropy Reducer ====================" # get args -git_branch = ARGV[0] +base_branch = ARGV[0] require 'fileutils' require 'pathname' @@ -22,7 +22,7 @@ current_warning_count = `./scripts/analysis/spotbugsSummary.py --total`.to_i puts "found warnings: " + current_warning_count.to_s # get warning counts from target branch -previous_xml = "/tmp/#{git_branch}.xml" +previous_xml = "/tmp/#{base_branch}.xml" previous_results = File.file?(previous_xml) if previous_results == true