From a5423f5cd6eac444c0231e9c69f24b83c91b9176 Mon Sep 17 00:00:00 2001 From: Jonah Graham Date: Wed, 11 Nov 2020 20:22:15 -0500 Subject: [PATCH] [releng] Sort output in compare and replace report MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Also-by: Torbjörn Svensson Change-Id: I0345c363a1f9c23c608e3b3765ca91dffa82077a --- releng/scripts/check_code_cleanliness.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/releng/scripts/check_code_cleanliness.sh b/releng/scripts/check_code_cleanliness.sh index a6e2bb26e87..2ba565a3fab 100755 --- a/releng/scripts/check_code_cleanliness.sh +++ b/releng/scripts/check_code_cleanliness.sh @@ -67,7 +67,7 @@ if ${MVN:-mvn} \ -P baseline-compare-and-replace >${logfile} 2>&1; then echo "Maven check all versions have been bumped appropriately appears to have completed successfully" else - bundles_only_qualifier_changed=$(grep "Only qualifier changed" ${logfile} | sed -e 's/^.*Only qualifier changed for .//' -e 's@/.*@@') + bundles_only_qualifier_changed=$(grep "Only qualifier changed" ${logfile} | sed -e 's/^.*Only qualifier changed for .//' -e 's@/.*@@' | sort) if [ -n "$bundles_only_qualifier_changed" ]; then echo "The following bundles are missing a service segment version bump:" for bundle in $bundles_only_qualifier_changed; do @@ -79,7 +79,7 @@ else echo fi - bundles_same_version_different_content=$(grep "baseline and build artifacts have same version but different contents" ${logfile} | sed -e 's/^.* on project //' -e 's@: baseline.*@@') + bundles_same_version_different_content=$(grep "baseline and build artifacts have same version but different contents" ${logfile} | sed -e 's/^.* on project //' -e 's@: baseline.*@@' | sort) if [ -n "$bundles_same_version_different_content" ]; then echo "The following bundles have same version as baseline, but different contents:" for bundle in $bundles_same_version_different_content; do