Upgrade to Xcode 13.4.1

Full software list: https://circle-macos-docs.s3.amazonaws.com/image-manifest/v8094/index.html
mozilla · Oct 25, 2022 · f941d76 · f941d76
1 parent 17cdfff
commit f941d76
Showing 1 changed file with 18 additions and 12 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -462,7 +462,7 @@ jobs:
 
   Check Swift formatting:
     macos:
-      xcode: "13.2.1"
+      xcode: "13.4.1"
     steps:
       - checkout
       - run:
@@ -478,7 +478,7 @@ jobs:
 
   iOS build and test:
     macos:
-      xcode: "13.2.1"
+      xcode: "13.4.1"
     steps:
       - checkout
       - run:
@@ -490,23 +490,28 @@ jobs:
       - setup-rust-toolchain
       - restore_cache:
           name: Restore rubygems cache
-          key: swift-docs-gems-v11
+          key: swift-docs-gems-v13
       - run:
           name: Install jazzy
           command: gem install jazzy
       - save_cache:
           name: Save rubygems cache
           # NEEDS TO CHANGE WHEN JAZZY OR RUBY IS UPDATED
-          key: swift-docs-gems-v11
+          key: swift-docs-gems-v13
           paths:
-            - ~/.gem/ruby/2.7.5
+            - ~/.gem/ruby/2.7.6
       - run:
           name: Setup build environment
           command: |
+            set -x
             rustup target add aarch64-apple-ios aarch64-apple-ios-sim x86_64-apple-ios
 
-            UDID=$(xcrun xctrace list devices 2>&1 | grep 'iPhone 11 Simulator (14' | awk -F'[()]' '{print $4}')
-            xcrun simctl boot "$UDID"
+            # List available devices -- allows us to see what's there
+            DEVICES=$(xcrun xctrace list devices 2>&1)
+            echo "$DEVICES"
+            # Pick a device and start it
+            UUID=$(echo "$DEVICES" | grep --max-count=1 'iPhone 11 Simulator (14' | awk -F'[()]' '{print $4}')
+            xcrun simctl boot "$UUID"
             # Store build type for use in cache key
             if [ -z "${CIRCLE_TAG}" ]; then
               echo "debug" > buildtype.txt
@@ -574,7 +579,7 @@ jobs:
 
   iOS integration test:
     macos:
-      xcode: "13.2.1"
+      xcode: "13.4.1"
     steps:
       - checkout
       - skip-if-doc-only
@@ -583,13 +588,14 @@ jobs:
       - run:
           name: Setup build environment
           command: |
+            set -x
             rustup target add aarch64-apple-ios aarch64-apple-ios-sim x86_64-apple-ios
 
             # List available devices -- allows us to see what's there
             DEVICES=$(xcrun xctrace list devices 2>&1)
             echo "$DEVICES"
             # Pick a device and start it
-            UDID=$(echo "$DEVICES" | grep 'iPhone 11 Simulator (14' | awk -F'[()]' '{print $4}')
+            UDID=$(echo "$DEVICES" | grep --max-count=1 'iPhone 11 Simulator (14' | awk -F'[()]' '{print $4}')
             xcrun simctl boot "$UDID"
       - run:
           name: Build XCFramework archive
@@ -625,7 +631,7 @@ jobs:
 
   iOS Framework release:
     macos:
-      xcode: "13.2.1"
+      xcode: "13.4.1"
     steps:
       - checkout
       - attach_workspace:
@@ -866,7 +872,7 @@ jobs:
 
   pypi-macos-release:
     macos:
-      xcode: "13.2.1"
+      xcode: "13.4.1"
     steps:
       - install-rustup
       - setup-rust-toolchain
@@ -898,7 +904,7 @@ jobs:
 
   pypi-macos-arm64-release:
     macos:
-      xcode: "13.2.1"
+      xcode: "13.4.1"
     steps:
       - install-rustup
       - setup-rust-toolchain