Merge branch 'release-candidate' into stable

Author: Jeff Verkoeyen

CHANGELOG.md

@@ -1,6 +1,20 @@
+# 3.1.0
+
+This minor release adds support for specifying a minimum Xcode version and improved support for unit
+test runs when using bazel.sh.
+
+## New features
+
+- It's now possible to specify a minimum Xcode version when running bazel commands.
+
+## Source changes
+
+* [Improved support for unit test runs (#7)](https://github.com/material-foundation/kokoro-ios-runner/commit/3f4c27c7af116ec72208beaffb7a11bd0366494b) (featherless)
+* [Add support for specifying a minimum Xcode version. (#6)](https://github.com/material-foundation/kokoro-ios-runner/commit/0f07d8f376189dcce3715dca89d00f2eb4461d0b) (featherless)
+
 # 3.0.0
 
-This major change adds support for running arbitrary bazel commands (notably test) on targets.
+This major release adds support for running arbitrary bazel commands (notably test) on targets.
 
 ## Breaking changes
 

README.md

@@ -18,7 +18,7 @@ fi
 
 pushd .kokoro-ios-runner
 git fetch
-git checkout v3.0.0
+git checkout v3.1.0
 popd
 
 ./.kokoro-ios-runner/xcodebuild.sh "MotionInterchange/MotionInterchange.xcodeproj" MotionInterchange "iPhone SE"
@@ -44,9 +44,9 @@ fi
 
 pushd .kokoro-ios-runner
 git fetch
-git checkout v3.0.0
+git checkout v3.1.0
 popd
 
-./.kokoro-ios-runner/bazel.sh build //:CatalogByConvention
-./.kokoro-ios-runner/bazel.sh test //:CatalogByConventionTests
+./.kokoro-ios-runner/bazel.sh build //:CatalogByConvention 8.0.0
+./.kokoro-ios-runner/bazel.sh test //:CatalogByConventionTests 8.0.0
 ```

bazel.sh

@@ -22,6 +22,7 @@
 # Arguments:
 #   1. bazel action (build or test, usually)
 #   2. BUILD target.
+#   3. Minimum Xcode version. E.g. "8" or "8.2.1"
 #
 # Example usage:
 #   bazel.sh build //:CatalogByConvention
@@ -33,17 +34,25 @@ set -e
 # Display commands to stderr.
 set -x
 
-script_version="v3.0.0"
+script_version="v3.1.0"
 echo "bazel_build_and_test version $script_version"
 
+version_as_number() {
+  padded_version="${1%.}" # Strip any trailing dots
+  # Pad with .0 until we get a M.m.p version string.
+  while [ $(grep -o "\." <<< "$padded_version" | wc -l) -lt "2" ]; do
+    padded_version=${padded_version}.0
+  done
+  echo "${padded_version//.}"
+}
+
 action="$1"
 target="$2"
+min_xcode_version="$(version_as_number $3)"
 
 # Dependencies
 
-if [ -z "$KOKORO_BUILD_NUMBER" ]; then
-  : # Local run - nothing to do.
-else
+if [ -n "$KOKORO_BUILD_NUMBER" ]; then
   # Move into our cloned repo
   cd github/repo
 fi
@@ -55,15 +64,31 @@ ls /Applications/ | grep "Xcode" | while read -r xcode_path; do
     | grep string \
     | cut -d'>' -f2 \
     | cut -d'<' -f1)
+  if [ -n "$min_xcode_version" ]; then
+    xcode_version_as_number="$(version_as_number $xcode_version)"
+
+    if [ "$xcode_version_as_number" -lt "$min_xcode_version" ]; then
+      continue
+    fi
+  fi
 
-  set +x
+  extra_args=""
   if [ "$action" == "build" ]; then
     echo "🏗️  $target with Xcode $xcode_version..."
   elif [ "$action" == "test" ]; then
     echo "🛠️  $target with Xcode $xcode_version..."
+    extra_args="--test_output=errors"
+
+    if [ -n "$KOKORO_BUILD_NUMBER" ]; then
+      sudo xcode-select --switch /Applications/$xcode_path/Contents/Developer
+      xcodebuild -version
+
+      # Resolves the following crash when switching Xcode versions:
+      # "Failed to locate a valid instance of CoreSimulatorService in the bootstrap"
+      launchctl remove com.apple.CoreSimulator.CoreSimulatorService || true
+    fi
   fi
-  set -x
 
   bazel clean
-  bazel $action $target --xcode_version $xcode_version
+  bazel $action $target --xcode_version $xcode_version $extra_args
 done

xcodebuild.sh

@@ -98,7 +98,7 @@ run() {
   fi
 }
 
-script_version="v3.0.0"
+script_version="v3.1.0"
 echo "build_and_test version $script_version"
 
 project="$1"