Fix return code logic

Author: andrewheard

scripts/build.sh

@@ -110,11 +110,12 @@ source scripts/check_secrets.sh
 function RunXcodebuild() {
   echo xcodebuild "$@"
 
-  xcbeautify_cmd=(xcbeautify --renderer github-actions)
+  xcbeautify_cmd=(xcbeautify --renderer github-actions --disable-logging)
 
   result=0
-  xcodebuild "$@" | tee xcodebuild.log | "${xcbeautify_cmd[@]}" || result=$?
-  result=$(CheckUnexpectedFailures $result xcodebuild.log)
+  xcodebuild "$@" | tee xcodebuild.log | "${xcbeautify_cmd[@]}" \
+    && CheckUnexpectedFailures xcodebuild.log \
+    || result=$?
 
   if [[ $result == 65 ]]; then
     ExportLogs "$@"
@@ -123,8 +124,9 @@ function RunXcodebuild() {
     sleep 5
 
     result=0
-    xcodebuild "$@" | tee xcodebuild.log | "${xcbeautify_cmd[@]}" || result=$?
-    result=$(CheckUnexpectedFailures $result xcodebuild.log)
+    xcodebuild "$@" | tee xcodebuild.log | "${xcbeautify_cmd[@]}" \
+      && CheckUnexpectedFailures xcodebuild.log \
+      || result=$?
   fi
 
   if [[ $result != 0 ]]; then
@@ -141,16 +143,11 @@ function ExportLogs() {
 }
 
 function CheckUnexpectedFailures() {
-  local result=$1
-  local log_file=$2
+  local log_file=$1
 
-  if [[ $result != 0 ]]; then
-    return "$result"
-  elif grep -Eq "[1-9]\d* failures \([1-9]\d* unexpected\)" "$log_file"; then
-    echo "xcodebuild failed with unexpected failures; updating exit code." 1>&2
+  if grep -Eq "[1-9]\d* failures \([1-9]\d* unexpected\)" "$log_file"; then
+    echo "xcodebuild failed with unexpected failures." 1>&2
     return 65
-  else
-    return "$result"
   fi
 }