Merge branch 'release-candidate' into stable

Author: Jeff Verkoeyen

CHANGELOG.md

@@ -1,3 +1,12 @@
+# 4.2.1
+
+Bazel builds will no longer force verbose output. Verbose output can be enabled by providing the -v
+flag.
+
+## Source changes
+
+* [Don't always use verbose output when running on bazel.](https://github.com/material-foundation/kokoro-ios-runner/commit/845084d9b1c06a67e87270beb91569dafda1c3aa) (Jeff Verkoeyen)
+
 # 4.2.0
 
 Local runs of the bazel.sh script now only run against the currently selected Xcode install. This should hopefully alleviate flakiness on local builds.

README.md

@@ -18,7 +18,7 @@ fi
 
 pushd .kokoro-ios-runner
 git fetch
-git checkout v4.2.0
+git checkout v4.2.1
 popd
 
 ./.kokoro-ios-runner/xcodebuild.sh "MotionInterchange/MotionInterchange.xcodeproj" MotionInterchange "iPhone SE"
@@ -44,7 +44,7 @@ fi
 
 pushd .kokoro-ios-runner
 git fetch
-git checkout v4.2.0
+git checkout v4.2.1
 popd
 
 ./.kokoro-ios-runner/bazel.sh test //:CatalogByConventionTests --min-xcode-version 8.0.0

bazel.sh

@@ -39,7 +39,7 @@
 # Fail on any error.
 set -e
 
-script_version="v4.2.0"
+script_version="v4.2.1"
 echo "$(basename $0) version $script_version"
 
 version_as_number() {
@@ -76,9 +76,6 @@ set -- "${POSITIONAL[@]}" # restore positional parameters
 if [ -n "$KOKORO_BUILD_NUMBER" ]; then
   # Move into our cloned repo
   cd github/repo
-
-  # Always enable verbose output on kokoro runs.
-  VERBOSE_OUTPUT=1
 fi
 
 if [ -n "$VERBOSE_OUTPUT" ]; then

xcodebuild.sh

@@ -98,7 +98,7 @@ run() {
   fi
 }
 
-script_version="v4.2.0"
+script_version="v4.2.1"
 echo "build_and_test version $script_version"
 
 project="$1"