[go: nahoru, domu]

[iOS] Roll iOS14 beta bots to Xcode 12.2 release candidate (12b5044c)

git grep -l '12b5035g' | xargs sed -i '' -e 's/12b5035g/12b5044c/g'

Bug: 1148325
Change-Id: Ifa509da0edd67c3666bf09345c8793d63274338f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2566736
Reviewed-by: Garrett Beaty <gbeaty@chromium.org>
Commit-Queue: Zhaoyang Li <zhaoyangli@chromium.org>
Cr-Commit-Position: refs/heads/master@{#832117}
diff --git a/infra/config/generated/cr-buildbucket.cfg b/infra/config/generated/cr-buildbucket.cfg
index d94d161..5a846db 100644
--- a/infra/config/generated/cr-buildbucket.cfg
+++ b/infra/config/generated/cr-buildbucket.cfg
@@ -17020,11 +17020,11 @@
         cipd_version: "refs/heads/master"
         cmd: "recipes"
       }
-      properties: "{\"$build/goma\":{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.fyi\",\"recipe\":\"chromium\",\"xcode_build_version\":\"12b5035g\"}"
+      properties: "{\"$build/goma\":{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.fyi\",\"recipe\":\"chromium\",\"xcode_build_version\":\"12b5044c\"}"
       execution_timeout_secs: 36000
       caches {
-        name: "xcode_ios_12b5035g"
-        path: "xcode_ios_12b5035g.app"
+        name: "xcode_ios_12b5044c"
+        path: "xcode_ios_12b5044c.app"
       }
       build_numbers: YES
       service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
@@ -32495,7 +32495,7 @@
         cipd_version: "refs/heads/master"
         cmd: "recipes"
       }
-      properties: "{\"$build/goma\":{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"tryserver.chromium.mac\",\"recipe\":\"chromium_trybot\",\"xcode_build_version\":\"12b5035g\"}"
+      properties: "{\"$build/goma\":{\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"tryserver.chromium.mac\",\"recipe\":\"chromium_trybot\",\"xcode_build_version\":\"12b5044c\"}"
       execution_timeout_secs: 14400
       expiration_secs: 7200
       caches {
@@ -32503,8 +32503,8 @@
         path: "win_toolchain"
       }
       caches {
-        name: "xcode_ios_12b5035g"
-        path: "xcode_ios_12b5035g.app"
+        name: "xcode_ios_12b5044c"
+        path: "xcode_ios_12b5044c.app"
       }
       build_numbers: YES
       service_account: "chromium-try-builder@chops-service-accounts.iam.gserviceaccount.com"
diff --git a/infra/config/lib/builders.star b/infra/config/lib/builders.star
index dd52f2d..58dd6ea 100644
--- a/infra/config/lib/builders.star
+++ b/infra/config/lib/builders.star
@@ -137,7 +137,7 @@
     # (current default) xc12 gm seed
     x12a7209 = xcode_enum("xcode_ios_12a7209", "xcode_ios_12a7209.app"),
     # latest Xcode 12 beta version.
-    x12b5035g = xcode_enum("xcode_ios_12b5035g", "xcode_ios_12b5035g.app"),
+    x12b5044c = xcode_enum("xcode_ios_12b5044c", "xcode_ios_12b5044c.app"),
 )
 
 ################################################################################
diff --git a/infra/config/subprojects/chromium/ci.star b/infra/config/subprojects/chromium/ci.star
index ea9468df..f0d143a 100644
--- a/infra/config/subprojects/chromium/ci.star
+++ b/infra/config/subprojects/chromium/ci.star
@@ -3124,9 +3124,9 @@
         category = "iOS|iOS14",
         short_name = "sdk14",
     ),
-    caches = [xcode_cache.x12b5035g],
+    caches = [xcode_cache.x12b5044c],
     properties = {
-        "xcode_build_version": "12b5035g",
+        "xcode_build_version": "12b5044c",
     },
 )
 
diff --git a/infra/config/subprojects/chromium/try.star b/infra/config/subprojects/chromium/try.star
index 4fff5a9..ae3e5a3 100644
--- a/infra/config/subprojects/chromium/try.star
+++ b/infra/config/subprojects/chromium/try.star
@@ -1404,9 +1404,9 @@
 
 try_.chromium_mac_ios_builder(
     name = "ios14-sdk-simulator",
-    caches = [xcode_cache.x12b5035g],
+    caches = [xcode_cache.x12b5044c],
     properties = {
-        "xcode_build_version": "12b5035g",
+        "xcode_build_version": "12b5044c",
     },
 )
 
diff --git a/testing/buildbot/chromium.fyi.json b/testing/buildbot/chromium.fyi.json
index ccbc638..1e72fcb 100644
--- a/testing/buildbot/chromium.fyi.json
+++ b/testing/buildbot/chromium.fyi.json
@@ -35858,7 +35858,7 @@
           "--out-dir",
           "${ISOLATED_OUTDIR}",
           "--xcode-build-version",
-          "12b5035g",
+          "12b5044c",
           "--xctest"
         ],
         "isolate_name": "absl_hardening_tests",
@@ -35883,7 +35883,7 @@
           ],
           "named_caches": [
             {
-              "name": "xcode_ios_12b5035g",
+              "name": "xcode_ios_12b5044c",
               "path": "Xcode.app"
             }
           ],
@@ -35900,7 +35900,7 @@
           "--out-dir",
           "${ISOLATED_OUTDIR}",
           "--xcode-build-version",
-          "12b5035g",
+          "12b5044c",
           "--xctest"
         ],
         "isolate_name": "base_unittests",
@@ -35925,7 +35925,7 @@
           ],
           "named_caches": [
             {
-              "name": "xcode_ios_12b5035g",
+              "name": "xcode_ios_12b5044c",
               "path": "Xcode.app"
             }
           ],
@@ -35942,7 +35942,7 @@
           "--out-dir",
           "${ISOLATED_OUTDIR}",
           "--xcode-build-version",
-          "12b5035g",
+          "12b5044c",
           "--xctest"
         ],
         "isolate_name": "base_unittests",
@@ -35967,7 +35967,7 @@
           ],
           "named_caches": [
             {
-              "name": "xcode_ios_12b5035g",
+              "name": "xcode_ios_12b5044c",
               "path": "Xcode.app"
             }
           ],
@@ -35984,7 +35984,7 @@
           "--out-dir",
           "${ISOLATED_OUTDIR}",
           "--xcode-build-version",
-          "12b5035g",
+          "12b5044c",
           "--xctest"
         ],
         "isolate_name": "base_unittests",
@@ -36009,7 +36009,7 @@
           ],
           "named_caches": [
             {
-              "name": "xcode_ios_12b5035g",
+              "name": "xcode_ios_12b5044c",
               "path": "Xcode.app"
             }
           ],
@@ -36026,7 +36026,7 @@
           "--out-dir",
           "${ISOLATED_OUTDIR}",
           "--xcode-build-version",
-          "12b5035g",
+          "12b5044c",
           "--xctest"
         ],
         "isolate_name": "boringssl_crypto_tests",
@@ -36051,7 +36051,7 @@
           ],
           "named_caches": [
             {
-              "name": "xcode_ios_12b5035g",
+              "name": "xcode_ios_12b5044c",
               "path": "Xcode.app"
             }
           ],
@@ -36068,7 +36068,7 @@
           "--out-dir",
           "${ISOLATED_OUTDIR}",
           "--xcode-build-version",
-          "12b5035g",
+          "12b5044c",
           "--xctest"
         ],
         "isolate_name": "boringssl_ssl_tests",
@@ -36093,7 +36093,7 @@
           ],
           "named_caches": [
             {
-              "name": "xcode_ios_12b5035g",
+              "name": "xcode_ios_12b5044c",
               "path": "Xcode.app"
             }
           ],
@@ -36110,7 +36110,7 @@
           "--out-dir",
           "${ISOLATED_OUTDIR}",
           "--xcode-build-version",
-          "12b5035g",
+          "12b5044c",
           "--xctest"
         ],
         "isolate_name": "components_unittests",
@@ -36135,7 +36135,7 @@
           ],
           "named_caches": [
             {
-              "name": "xcode_ios_12b5035g",
+              "name": "xcode_ios_12b5044c",
               "path": "Xcode.app"
             }
           ],
@@ -36152,7 +36152,7 @@
           "--out-dir",
           "${ISOLATED_OUTDIR}",
           "--xcode-build-version",
-          "12b5035g",
+          "12b5044c",
           "--xctest"
         ],
         "isolate_name": "components_unittests",
@@ -36177,7 +36177,7 @@
           ],
           "named_caches": [
             {
-              "name": "xcode_ios_12b5035g",
+              "name": "xcode_ios_12b5044c",
               "path": "Xcode.app"
             }
           ],
@@ -36194,7 +36194,7 @@
           "--out-dir",
           "${ISOLATED_OUTDIR}",
           "--xcode-build-version",
-          "12b5035g",
+          "12b5044c",
           "--xctest"
         ],
         "isolate_name": "components_unittests",
@@ -36219,7 +36219,7 @@
           ],
           "named_caches": [
             {
-              "name": "xcode_ios_12b5035g",
+              "name": "xcode_ios_12b5044c",
               "path": "Xcode.app"
             }
           ],
@@ -36236,7 +36236,7 @@
           "--out-dir",
           "${ISOLATED_OUTDIR}",
           "--xcode-build-version",
-          "12b5035g",
+          "12b5044c",
           "--xctest"
         ],
         "isolate_name": "crypto_unittests",
@@ -36261,7 +36261,7 @@
           ],
           "named_caches": [
             {
-              "name": "xcode_ios_12b5035g",
+              "name": "xcode_ios_12b5044c",
               "path": "Xcode.app"
             }
           ],
@@ -36278,7 +36278,7 @@
           "--out-dir",
           "${ISOLATED_OUTDIR}",
           "--xcode-build-version",
-          "12b5035g",
+          "12b5044c",
           "--xctest"
         ],
         "isolate_name": "gfx_unittests",
@@ -36303,7 +36303,7 @@
           ],
           "named_caches": [
             {
-              "name": "xcode_ios_12b5035g",
+              "name": "xcode_ios_12b5044c",
               "path": "Xcode.app"
             }
           ],
@@ -36320,7 +36320,7 @@
           "--out-dir",
           "${ISOLATED_OUTDIR}",
           "--xcode-build-version",
-          "12b5035g",
+          "12b5044c",
           "--xctest"
         ],
         "isolate_name": "gfx_unittests",
@@ -36345,7 +36345,7 @@
           ],
           "named_caches": [
             {
-              "name": "xcode_ios_12b5035g",
+              "name": "xcode_ios_12b5044c",
               "path": "Xcode.app"
             }
           ],
@@ -36362,7 +36362,7 @@
           "--out-dir",
           "${ISOLATED_OUTDIR}",
           "--xcode-build-version",
-          "12b5035g",
+          "12b5044c",
           "--xctest"
         ],
         "isolate_name": "gfx_unittests",
@@ -36387,7 +36387,7 @@
           ],
           "named_caches": [
             {
-              "name": "xcode_ios_12b5035g",
+              "name": "xcode_ios_12b5044c",
               "path": "Xcode.app"
             }
           ],
@@ -36404,7 +36404,7 @@
           "--out-dir",
           "${ISOLATED_OUTDIR}",
           "--xcode-build-version",
-          "12b5035g",
+          "12b5044c",
           "--xctest"
         ],
         "isolate_name": "google_apis_unittests",
@@ -36429,7 +36429,7 @@
           ],
           "named_caches": [
             {
-              "name": "xcode_ios_12b5035g",
+              "name": "xcode_ios_12b5044c",
               "path": "Xcode.app"
             }
           ],
@@ -36446,7 +36446,7 @@
           "--out-dir",
           "${ISOLATED_OUTDIR}",
           "--xcode-build-version",
-          "12b5035g",
+          "12b5044c",
           "--xctest",
           "--xcode-parallelization"
         ],
@@ -36472,7 +36472,7 @@
           ],
           "named_caches": [
             {
-              "name": "xcode_ios_12b5035g",
+              "name": "xcode_ios_12b5044c",
               "path": "Xcode.app"
             }
           ],
@@ -36489,7 +36489,7 @@
           "--out-dir",
           "${ISOLATED_OUTDIR}",
           "--xcode-build-version",
-          "12b5035g",
+          "12b5044c",
           "--xctest",
           "--xcode-parallelization"
         ],
@@ -36515,7 +36515,7 @@
           ],
           "named_caches": [
             {
-              "name": "xcode_ios_12b5035g",
+              "name": "xcode_ios_12b5044c",
               "path": "Xcode.app"
             }
           ],
@@ -36532,7 +36532,7 @@
           "--out-dir",
           "${ISOLATED_OUTDIR}",
           "--xcode-build-version",
-          "12b5035g",
+          "12b5044c",
           "--xctest",
           "--xcode-parallelization"
         ],
@@ -36558,7 +36558,7 @@
           ],
           "named_caches": [
             {
-              "name": "xcode_ios_12b5035g",
+              "name": "xcode_ios_12b5044c",
               "path": "Xcode.app"
             }
           ],
@@ -36575,7 +36575,7 @@
           "--out-dir",
           "${ISOLATED_OUTDIR}",
           "--xcode-build-version",
-          "12b5035g",
+          "12b5044c",
           "--xctest",
           "--xcode-parallelization"
         ],
@@ -36601,7 +36601,7 @@
           ],
           "named_caches": [
             {
-              "name": "xcode_ios_12b5035g",
+              "name": "xcode_ios_12b5044c",
               "path": "Xcode.app"
             }
           ],
@@ -36618,7 +36618,7 @@
           "--out-dir",
           "${ISOLATED_OUTDIR}",
           "--xcode-build-version",
-          "12b5035g",
+          "12b5044c",
           "--xctest",
           "--xcode-parallelization"
         ],
@@ -36644,7 +36644,7 @@
           ],
           "named_caches": [
             {
-              "name": "xcode_ios_12b5035g",
+              "name": "xcode_ios_12b5044c",
               "path": "Xcode.app"
             }
           ],
@@ -36662,7 +36662,7 @@
           "--out-dir",
           "${ISOLATED_OUTDIR}",
           "--xcode-build-version",
-          "12b5035g",
+          "12b5044c",
           "--xctest",
           "--xcode-parallelization"
         ],
@@ -36688,7 +36688,7 @@
           ],
           "named_caches": [
             {
-              "name": "xcode_ios_12b5035g",
+              "name": "xcode_ios_12b5044c",
               "path": "Xcode.app"
             }
           ],
@@ -36706,7 +36706,7 @@
           "--out-dir",
           "${ISOLATED_OUTDIR}",
           "--xcode-build-version",
-          "12b5035g",
+          "12b5044c",
           "--xctest",
           "--xcode-parallelization"
         ],
@@ -36732,7 +36732,7 @@
           ],
           "named_caches": [
             {
-              "name": "xcode_ios_12b5035g",
+              "name": "xcode_ios_12b5044c",
               "path": "Xcode.app"
             }
           ],
@@ -36750,7 +36750,7 @@
           "--out-dir",
           "${ISOLATED_OUTDIR}",
           "--xcode-build-version",
-          "12b5035g",
+          "12b5044c",
           "--xctest",
           "--xcode-parallelization"
         ],
@@ -36776,7 +36776,7 @@
           ],
           "named_caches": [
             {
-              "name": "xcode_ios_12b5035g",
+              "name": "xcode_ios_12b5044c",
               "path": "Xcode.app"
             }
           ],
@@ -36794,7 +36794,7 @@
           "--out-dir",
           "${ISOLATED_OUTDIR}",
           "--xcode-build-version",
-          "12b5035g",
+          "12b5044c",
           "--xctest",
           "--xcode-parallelization"
         ],
@@ -36820,7 +36820,7 @@
           ],
           "named_caches": [
             {
-              "name": "xcode_ios_12b5035g",
+              "name": "xcode_ios_12b5044c",
               "path": "Xcode.app"
             }
           ],
@@ -36838,7 +36838,7 @@
           "--out-dir",
           "${ISOLATED_OUTDIR}",
           "--xcode-build-version",
-          "12b5035g",
+          "12b5044c",
           "--xctest",
           "--xcode-parallelization"
         ],
@@ -36864,7 +36864,7 @@
           ],
           "named_caches": [
             {
-              "name": "xcode_ios_12b5035g",
+              "name": "xcode_ios_12b5044c",
               "path": "Xcode.app"
             }
           ],
@@ -36882,7 +36882,7 @@
           "--out-dir",
           "${ISOLATED_OUTDIR}",
           "--xcode-build-version",
-          "12b5035g",
+          "12b5044c",
           "--xctest",
           "--xcode-parallelization"
         ],
@@ -36908,7 +36908,7 @@
           ],
           "named_caches": [
             {
-              "name": "xcode_ios_12b5035g",
+              "name": "xcode_ios_12b5044c",
               "path": "Xcode.app"
             }
           ],
@@ -36926,7 +36926,7 @@
           "--out-dir",
           "${ISOLATED_OUTDIR}",
           "--xcode-build-version",
-          "12b5035g",
+          "12b5044c",
           "--xctest",
           "--xcode-parallelization"
         ],
@@ -36952,7 +36952,7 @@
           ],
           "named_caches": [
             {
-              "name": "xcode_ios_12b5035g",
+              "name": "xcode_ios_12b5044c",
               "path": "Xcode.app"
             }
           ],
@@ -36970,7 +36970,7 @@
           "--out-dir",
           "${ISOLATED_OUTDIR}",
           "--xcode-build-version",
-          "12b5035g",
+          "12b5044c",
           "--xctest",
           "--xcode-parallelization"
         ],
@@ -36996,7 +36996,7 @@
           ],
           "named_caches": [
             {
-              "name": "xcode_ios_12b5035g",
+              "name": "xcode_ios_12b5044c",
               "path": "Xcode.app"
             }
           ],
@@ -37013,7 +37013,7 @@
           "--out-dir",
           "${ISOLATED_OUTDIR}",
           "--xcode-build-version",
-          "12b5035g",
+          "12b5044c",
           "--xctest",
           "--xcode-parallelization"
         ],
@@ -37039,7 +37039,7 @@
           ],
           "named_caches": [
             {
-              "name": "xcode_ios_12b5035g",
+              "name": "xcode_ios_12b5044c",
               "path": "Xcode.app"
             }
           ],
@@ -37056,7 +37056,7 @@
           "--out-dir",
           "${ISOLATED_OUTDIR}",
           "--xcode-build-version",
-          "12b5035g",
+          "12b5044c",
           "--xctest",
           "--xcode-parallelization"
         ],
@@ -37082,7 +37082,7 @@
           ],
           "named_caches": [
             {
-              "name": "xcode_ios_12b5035g",
+              "name": "xcode_ios_12b5044c",
               "path": "Xcode.app"
             }
           ],
@@ -37099,7 +37099,7 @@
           "--out-dir",
           "${ISOLATED_OUTDIR}",
           "--xcode-build-version",
-          "12b5035g",
+          "12b5044c",
           "--xctest",
           "--xcode-parallelization"
         ],
@@ -37125,7 +37125,7 @@
           ],
           "named_caches": [
             {
-              "name": "xcode_ios_12b5035g",
+              "name": "xcode_ios_12b5044c",
               "path": "Xcode.app"
             }
           ],
@@ -37142,7 +37142,7 @@
           "--out-dir",
           "${ISOLATED_OUTDIR}",
           "--xcode-build-version",
-          "12b5035g",
+          "12b5044c",
           "--xctest",
           "--xcode-parallelization"
         ],
@@ -37168,7 +37168,7 @@
           ],
           "named_caches": [
             {
-              "name": "xcode_ios_12b5035g",
+              "name": "xcode_ios_12b5044c",
               "path": "Xcode.app"
             }
           ],
@@ -37185,7 +37185,7 @@
           "--out-dir",
           "${ISOLATED_OUTDIR}",
           "--xcode-build-version",
-          "12b5035g",
+          "12b5044c",
           "--xctest",
           "--xcode-parallelization"
         ],
@@ -37211,7 +37211,7 @@
           ],
           "named_caches": [
             {
-              "name": "xcode_ios_12b5035g",
+              "name": "xcode_ios_12b5044c",
               "path": "Xcode.app"
             }
           ],
@@ -37228,7 +37228,7 @@
           "--out-dir",
           "${ISOLATED_OUTDIR}",
           "--xcode-build-version",
-          "12b5035g",
+          "12b5044c",
           "--xctest",
           "--xcode-parallelization"
         ],
@@ -37254,7 +37254,7 @@
           ],
           "named_caches": [
             {
-              "name": "xcode_ios_12b5035g",
+              "name": "xcode_ios_12b5044c",
               "path": "Xcode.app"
             }
           ],
@@ -37271,7 +37271,7 @@
           "--out-dir",
           "${ISOLATED_OUTDIR}",
           "--xcode-build-version",
-          "12b5035g",
+          "12b5044c",
           "--xctest",
           "--xcode-parallelization"
         ],
@@ -37297,7 +37297,7 @@
           ],
           "named_caches": [
             {
-              "name": "xcode_ios_12b5035g",
+              "name": "xcode_ios_12b5044c",
               "path": "Xcode.app"
             }
           ],
@@ -37314,7 +37314,7 @@
           "--out-dir",
           "${ISOLATED_OUTDIR}",
           "--xcode-build-version",
-          "12b5035g",
+          "12b5044c",
           "--xctest",
           "--xcode-parallelization"
         ],
@@ -37340,7 +37340,7 @@
           ],
           "named_caches": [
             {
-              "name": "xcode_ios_12b5035g",
+              "name": "xcode_ios_12b5044c",
               "path": "Xcode.app"
             }
           ],
@@ -37358,7 +37358,7 @@
           "--out-dir",
           "${ISOLATED_OUTDIR}",
           "--xcode-build-version",
-          "12b5035g",
+          "12b5044c",
           "--xctest",
           "--xcode-parallelization"
         ],
@@ -37384,7 +37384,7 @@
           ],
           "named_caches": [
             {
-              "name": "xcode_ios_12b5035g",
+              "name": "xcode_ios_12b5044c",
               "path": "Xcode.app"
             }
           ],
@@ -37402,7 +37402,7 @@
           "--out-dir",
           "${ISOLATED_OUTDIR}",
           "--xcode-build-version",
-          "12b5035g",
+          "12b5044c",
           "--xctest",
           "--xcode-parallelization"
         ],
@@ -37428,7 +37428,7 @@
           ],
           "named_caches": [
             {
-              "name": "xcode_ios_12b5035g",
+              "name": "xcode_ios_12b5044c",
               "path": "Xcode.app"
             }
           ],
@@ -37446,7 +37446,7 @@
           "--out-dir",
           "${ISOLATED_OUTDIR}",
           "--xcode-build-version",
-          "12b5035g",
+          "12b5044c",
           "--xctest",
           "--xcode-parallelization"
         ],
@@ -37472,7 +37472,7 @@
           ],
           "named_caches": [
             {
-              "name": "xcode_ios_12b5035g",
+              "name": "xcode_ios_12b5044c",
               "path": "Xcode.app"
             }
           ],
@@ -37490,7 +37490,7 @@
           "--out-dir",
           "${ISOLATED_OUTDIR}",
           "--xcode-build-version",
-          "12b5035g",
+          "12b5044c",
           "--xctest"
         ],
         "isolate_name": "ios_chrome_unittests",
@@ -37515,7 +37515,7 @@
           ],
           "named_caches": [
             {
-              "name": "xcode_ios_12b5035g",
+              "name": "xcode_ios_12b5044c",
               "path": "Xcode.app"
             }
           ],
@@ -37532,7 +37532,7 @@
           "--out-dir",
           "${ISOLATED_OUTDIR}",
           "--xcode-build-version",
-          "12b5035g",
+          "12b5044c",
           "--xctest"
         ],
         "isolate_name": "ios_chrome_unittests",
@@ -37557,7 +37557,7 @@
           ],
           "named_caches": [
             {
-              "name": "xcode_ios_12b5035g",
+              "name": "xcode_ios_12b5044c",
               "path": "Xcode.app"
             }
           ],
@@ -37574,7 +37574,7 @@
           "--out-dir",
           "${ISOLATED_OUTDIR}",
           "--xcode-build-version",
-          "12b5035g",
+          "12b5044c",
           "--xctest"
         ],
         "isolate_name": "ios_chrome_unittests",
@@ -37599,7 +37599,7 @@
           ],
           "named_caches": [
             {
-              "name": "xcode_ios_12b5035g",
+              "name": "xcode_ios_12b5044c",
               "path": "Xcode.app"
             }
           ],
@@ -37616,7 +37616,7 @@
           "--out-dir",
           "${ISOLATED_OUTDIR}",
           "--xcode-build-version",
-          "12b5035g",
+          "12b5044c",
           "--xctest",
           "--xcode-parallelization"
         ],
@@ -37642,7 +37642,7 @@
           ],
           "named_caches": [
             {
-              "name": "xcode_ios_12b5035g",
+              "name": "xcode_ios_12b5044c",
               "path": "Xcode.app"
             }
           ],
@@ -37659,7 +37659,7 @@
           "--out-dir",
           "${ISOLATED_OUTDIR}",
           "--xcode-build-version",
-          "12b5035g",
+          "12b5044c",
           "--xctest",
           "--xcode-parallelization"
         ],
@@ -37685,7 +37685,7 @@
           ],
           "named_caches": [
             {
-              "name": "xcode_ios_12b5035g",
+              "name": "xcode_ios_12b5044c",
               "path": "Xcode.app"
             }
           ],
@@ -37702,7 +37702,7 @@
           "--out-dir",
           "${ISOLATED_OUTDIR}",
           "--xcode-build-version",
-          "12b5035g",
+          "12b5044c",
           "--xctest",
           "--xcode-parallelization"
         ],
@@ -37728,7 +37728,7 @@
           ],
           "named_caches": [
             {
-              "name": "xcode_ios_12b5035g",
+              "name": "xcode_ios_12b5044c",
               "path": "Xcode.app"
             }
           ],
@@ -37745,7 +37745,7 @@
           "--out-dir",
           "${ISOLATED_OUTDIR}",
           "--xcode-build-version",
-          "12b5035g",
+          "12b5044c",
           "--xctest",
           "--xcode-parallelization"
         ],
@@ -37771,7 +37771,7 @@
           ],
           "named_caches": [
             {
-              "name": "xcode_ios_12b5035g",
+              "name": "xcode_ios_12b5044c",
               "path": "Xcode.app"
             }
           ],
@@ -37788,7 +37788,7 @@
           "--out-dir",
           "${ISOLATED_OUTDIR}",
           "--xcode-build-version",
-          "12b5035g",
+          "12b5044c",
           "--xctest"
         ],
         "isolate_name": "ios_components_unittests",
@@ -37813,7 +37813,7 @@
           ],
           "named_caches": [
             {
-              "name": "xcode_ios_12b5035g",
+              "name": "xcode_ios_12b5044c",
               "path": "Xcode.app"
             }
           ],
@@ -37830,7 +37830,7 @@
           "--out-dir",
           "${ISOLATED_OUTDIR}",
           "--xcode-build-version",
-          "12b5035g",
+          "12b5044c",
           "--xctest"
         ],
         "isolate_name": "ios_net_unittests",
@@ -37855,7 +37855,7 @@
           ],
           "named_caches": [
             {
-              "name": "xcode_ios_12b5035g",
+              "name": "xcode_ios_12b5044c",
               "path": "Xcode.app"
             }
           ],
@@ -37872,7 +37872,7 @@
           "--out-dir",
           "${ISOLATED_OUTDIR}",
           "--xcode-build-version",
-          "12b5035g",
+          "12b5044c",
           "--xctest"
         ],
         "isolate_name": "ios_remoting_unittests",
@@ -37897,7 +37897,7 @@
           ],
           "named_caches": [
             {
-              "name": "xcode_ios_12b5035g",
+              "name": "xcode_ios_12b5044c",
               "path": "Xcode.app"
             }
           ],
@@ -37914,7 +37914,7 @@
           "--out-dir",
           "${ISOLATED_OUTDIR}",
           "--xcode-build-version",
-          "12b5035g",
+          "12b5044c",
           "--xctest",
           "--xcode-parallelization"
         ],
@@ -37940,7 +37940,7 @@
           ],
           "named_caches": [
             {
-              "name": "xcode_ios_12b5035g",
+              "name": "xcode_ios_12b5044c",
               "path": "Xcode.app"
             }
           ],
@@ -37957,7 +37957,7 @@
           "--out-dir",
           "${ISOLATED_OUTDIR}",
           "--xcode-build-version",
-          "12b5035g",
+          "12b5044c",
           "--xctest",
           "--xcode-parallelization"
         ],
@@ -37983,7 +37983,7 @@
           ],
           "named_caches": [
             {
-              "name": "xcode_ios_12b5035g",
+              "name": "xcode_ios_12b5044c",
               "path": "Xcode.app"
             }
           ],
@@ -38000,7 +38000,7 @@
           "--out-dir",
           "${ISOLATED_OUTDIR}",
           "--xcode-build-version",
-          "12b5035g",
+          "12b5044c",
           "--xctest",
           "--xcode-parallelization"
         ],
@@ -38026,7 +38026,7 @@
           ],
           "named_caches": [
             {
-              "name": "xcode_ios_12b5035g",
+              "name": "xcode_ios_12b5044c",
               "path": "Xcode.app"
             }
           ],
@@ -38043,7 +38043,7 @@
           "--out-dir",
           "${ISOLATED_OUTDIR}",
           "--xcode-build-version",
-          "12b5035g",
+          "12b5044c",
           "--xctest",
           "--xcode-parallelization"
         ],
@@ -38069,7 +38069,7 @@
           ],
           "named_caches": [
             {
-              "name": "xcode_ios_12b5035g",
+              "name": "xcode_ios_12b5044c",
               "path": "Xcode.app"
             }
           ],
@@ -38086,7 +38086,7 @@
           "--out-dir",
           "${ISOLATED_OUTDIR}",
           "--xcode-build-version",
-          "12b5035g",
+          "12b5044c",
           "--xctest"
         ],
         "isolate_name": "ios_testing_unittests",
@@ -38111,7 +38111,7 @@
           ],
           "named_caches": [
             {
-              "name": "xcode_ios_12b5035g",
+              "name": "xcode_ios_12b5044c",
               "path": "Xcode.app"
             }
           ],
@@ -38128,7 +38128,7 @@
           "--out-dir",
           "${ISOLATED_OUTDIR}",
           "--xcode-build-version",
-          "12b5035g",
+          "12b5044c",
           "--xctest"
         ],
         "isolate_name": "ios_web_inttests",
@@ -38153,7 +38153,7 @@
           ],
           "named_caches": [
             {
-              "name": "xcode_ios_12b5035g",
+              "name": "xcode_ios_12b5044c",
               "path": "Xcode.app"
             }
           ],
@@ -38170,7 +38170,7 @@
           "--out-dir",
           "${ISOLATED_OUTDIR}",
           "--xcode-build-version",
-          "12b5035g",
+          "12b5044c",
           "--xctest"
         ],
         "isolate_name": "ios_web_inttests",
@@ -38195,7 +38195,7 @@
           ],
           "named_caches": [
             {
-              "name": "xcode_ios_12b5035g",
+              "name": "xcode_ios_12b5044c",
               "path": "Xcode.app"
             }
           ],
@@ -38212,7 +38212,7 @@
           "--out-dir",
           "${ISOLATED_OUTDIR}",
           "--xcode-build-version",
-          "12b5035g",
+          "12b5044c",
           "--xctest"
         ],
         "isolate_name": "ios_web_inttests",
@@ -38237,7 +38237,7 @@
           ],
           "named_caches": [
             {
-              "name": "xcode_ios_12b5035g",
+              "name": "xcode_ios_12b5044c",
               "path": "Xcode.app"
             }
           ],
@@ -38254,7 +38254,7 @@
           "--out-dir",
           "${ISOLATED_OUTDIR}",
           "--xcode-build-version",
-          "12b5035g",
+          "12b5044c",
           "--xctest",
           "--xcode-parallelization"
         ],
@@ -38280,7 +38280,7 @@
           ],
           "named_caches": [
             {
-              "name": "xcode_ios_12b5035g",
+              "name": "xcode_ios_12b5044c",
               "path": "Xcode.app"
             }
           ],
@@ -38297,7 +38297,7 @@
           "--out-dir",
           "${ISOLATED_OUTDIR}",
           "--xcode-build-version",
-          "12b5035g",
+          "12b5044c",
           "--xctest",
           "--xcode-parallelization"
         ],
@@ -38323,7 +38323,7 @@
           ],
           "named_caches": [
             {
-              "name": "xcode_ios_12b5035g",
+              "name": "xcode_ios_12b5044c",
               "path": "Xcode.app"
             }
           ],
@@ -38340,7 +38340,7 @@
           "--out-dir",
           "${ISOLATED_OUTDIR}",
           "--xcode-build-version",
-          "12b5035g",
+          "12b5044c",
           "--xctest",
           "--xcode-parallelization"
         ],
@@ -38366,7 +38366,7 @@
           ],
           "named_caches": [
             {
-              "name": "xcode_ios_12b5035g",
+              "name": "xcode_ios_12b5044c",
               "path": "Xcode.app"
             }
           ],
@@ -38383,7 +38383,7 @@
           "--out-dir",
           "${ISOLATED_OUTDIR}",
           "--xcode-build-version",
-          "12b5035g",
+          "12b5044c",
           "--xctest",
           "--xcode-parallelization"
         ],
@@ -38409,7 +38409,7 @@
           ],
           "named_caches": [
             {
-              "name": "xcode_ios_12b5035g",
+              "name": "xcode_ios_12b5044c",
               "path": "Xcode.app"
             }
           ],
@@ -38426,7 +38426,7 @@
           "--out-dir",
           "${ISOLATED_OUTDIR}",
           "--xcode-build-version",
-          "12b5035g",
+          "12b5044c",
           "--xctest"
         ],
         "isolate_name": "ios_web_unittests",
@@ -38451,7 +38451,7 @@
           ],
           "named_caches": [
             {
-              "name": "xcode_ios_12b5035g",
+              "name": "xcode_ios_12b5044c",
               "path": "Xcode.app"
             }
           ],
@@ -38468,7 +38468,7 @@
           "--out-dir",
           "${ISOLATED_OUTDIR}",
           "--xcode-build-version",
-          "12b5035g",
+          "12b5044c",
           "--xctest"
         ],
         "isolate_name": "ios_web_unittests",
@@ -38493,7 +38493,7 @@
           ],
           "named_caches": [
             {
-              "name": "xcode_ios_12b5035g",
+              "name": "xcode_ios_12b5044c",
               "path": "Xcode.app"
             }
           ],
@@ -38510,7 +38510,7 @@
           "--out-dir",
           "${ISOLATED_OUTDIR}",
           "--xcode-build-version",
-          "12b5035g",
+          "12b5044c",
           "--xctest"
         ],
         "isolate_name": "ios_web_unittests",
@@ -38535,7 +38535,7 @@
           ],
           "named_caches": [
             {
-              "name": "xcode_ios_12b5035g",
+              "name": "xcode_ios_12b5044c",
               "path": "Xcode.app"
             }
           ],
@@ -38552,7 +38552,7 @@
           "--out-dir",
           "${ISOLATED_OUTDIR}",
           "--xcode-build-version",
-          "12b5035g",
+          "12b5044c",
           "--xctest"
         ],
         "isolate_name": "ios_web_view_inttests",
@@ -38577,7 +38577,7 @@
           ],
           "named_caches": [
             {
-              "name": "xcode_ios_12b5035g",
+              "name": "xcode_ios_12b5044c",
               "path": "Xcode.app"
             }
           ],
@@ -38594,7 +38594,7 @@
           "--out-dir",
           "${ISOLATED_OUTDIR}",
           "--xcode-build-version",
-          "12b5035g",
+          "12b5044c",
           "--xctest"
         ],
         "isolate_name": "ios_web_view_inttests",
@@ -38619,7 +38619,7 @@
           ],
           "named_caches": [
             {
-              "name": "xcode_ios_12b5035g",
+              "name": "xcode_ios_12b5044c",
               "path": "Xcode.app"
             }
           ],
@@ -38636,7 +38636,7 @@
           "--out-dir",
           "${ISOLATED_OUTDIR}",
           "--xcode-build-version",
-          "12b5035g",
+          "12b5044c",
           "--xctest"
         ],
         "isolate_name": "ios_web_view_inttests",
@@ -38661,7 +38661,7 @@
           ],
           "named_caches": [
             {
-              "name": "xcode_ios_12b5035g",
+              "name": "xcode_ios_12b5044c",
               "path": "Xcode.app"
             }
           ],
@@ -38678,7 +38678,7 @@
           "--out-dir",
           "${ISOLATED_OUTDIR}",
           "--xcode-build-version",
-          "12b5035g",
+          "12b5044c",
           "--xctest"
         ],
         "isolate_name": "ios_web_view_unittests",
@@ -38703,7 +38703,7 @@
           ],
           "named_caches": [
             {
-              "name": "xcode_ios_12b5035g",
+              "name": "xcode_ios_12b5044c",
               "path": "Xcode.app"
             }
           ],
@@ -38720,7 +38720,7 @@
           "--out-dir",
           "${ISOLATED_OUTDIR}",
           "--xcode-build-version",
-          "12b5035g",
+          "12b5044c",
           "--xctest"
         ],
         "isolate_name": "ios_web_view_unittests",
@@ -38745,7 +38745,7 @@
           ],
           "named_caches": [
             {
-              "name": "xcode_ios_12b5035g",
+              "name": "xcode_ios_12b5044c",
               "path": "Xcode.app"
             }
           ],
@@ -38762,7 +38762,7 @@
           "--out-dir",
           "${ISOLATED_OUTDIR}",
           "--xcode-build-version",
-          "12b5035g",
+          "12b5044c",
           "--xctest"
         ],
         "isolate_name": "ios_web_view_unittests",
@@ -38787,7 +38787,7 @@
           ],
           "named_caches": [
             {
-              "name": "xcode_ios_12b5035g",
+              "name": "xcode_ios_12b5044c",
               "path": "Xcode.app"
             }
           ],
@@ -38804,7 +38804,7 @@
           "--out-dir",
           "${ISOLATED_OUTDIR}",
           "--xcode-build-version",
-          "12b5035g",
+          "12b5044c",
           "--xctest"
         ],
         "isolate_name": "net_unittests",
@@ -38829,7 +38829,7 @@
           ],
           "named_caches": [
             {
-              "name": "xcode_ios_12b5035g",
+              "name": "xcode_ios_12b5044c",
               "path": "Xcode.app"
             }
           ],
@@ -38846,7 +38846,7 @@
           "--out-dir",
           "${ISOLATED_OUTDIR}",
           "--xcode-build-version",
-          "12b5035g",
+          "12b5044c",
           "--xctest"
         ],
         "isolate_name": "services_unittests",
@@ -38871,7 +38871,7 @@
           ],
           "named_caches": [
             {
-              "name": "xcode_ios_12b5035g",
+              "name": "xcode_ios_12b5044c",
               "path": "Xcode.app"
             }
           ],
@@ -38888,7 +38888,7 @@
           "--out-dir",
           "${ISOLATED_OUTDIR}",
           "--xcode-build-version",
-          "12b5035g",
+          "12b5044c",
           "--xctest"
         ],
         "isolate_name": "skia_unittests",
@@ -38913,7 +38913,7 @@
           ],
           "named_caches": [
             {
-              "name": "xcode_ios_12b5035g",
+              "name": "xcode_ios_12b5044c",
               "path": "Xcode.app"
             }
           ],
@@ -38930,7 +38930,7 @@
           "--out-dir",
           "${ISOLATED_OUTDIR}",
           "--xcode-build-version",
-          "12b5035g",
+          "12b5044c",
           "--xctest"
         ],
         "isolate_name": "skia_unittests",
@@ -38955,7 +38955,7 @@
           ],
           "named_caches": [
             {
-              "name": "xcode_ios_12b5035g",
+              "name": "xcode_ios_12b5044c",
               "path": "Xcode.app"
             }
           ],
@@ -38972,7 +38972,7 @@
           "--out-dir",
           "${ISOLATED_OUTDIR}",
           "--xcode-build-version",
-          "12b5035g",
+          "12b5044c",
           "--xctest"
         ],
         "isolate_name": "skia_unittests",
@@ -38997,7 +38997,7 @@
           ],
           "named_caches": [
             {
-              "name": "xcode_ios_12b5035g",
+              "name": "xcode_ios_12b5044c",
               "path": "Xcode.app"
             }
           ],
@@ -39014,7 +39014,7 @@
           "--out-dir",
           "${ISOLATED_OUTDIR}",
           "--xcode-build-version",
-          "12b5035g",
+          "12b5044c",
           "--xctest"
         ],
         "isolate_name": "sql_unittests",
@@ -39039,7 +39039,7 @@
           ],
           "named_caches": [
             {
-              "name": "xcode_ios_12b5035g",
+              "name": "xcode_ios_12b5044c",
               "path": "Xcode.app"
             }
           ],
@@ -39056,7 +39056,7 @@
           "--out-dir",
           "${ISOLATED_OUTDIR}",
           "--xcode-build-version",
-          "12b5035g",
+          "12b5044c",
           "--xctest"
         ],
         "isolate_name": "ui_base_unittests",
@@ -39081,7 +39081,7 @@
           ],
           "named_caches": [
             {
-              "name": "xcode_ios_12b5035g",
+              "name": "xcode_ios_12b5044c",
               "path": "Xcode.app"
             }
           ],
@@ -39098,7 +39098,7 @@
           "--out-dir",
           "${ISOLATED_OUTDIR}",
           "--xcode-build-version",
-          "12b5035g",
+          "12b5044c",
           "--xctest"
         ],
         "isolate_name": "ui_base_unittests",
@@ -39123,7 +39123,7 @@
           ],
           "named_caches": [
             {
-              "name": "xcode_ios_12b5035g",
+              "name": "xcode_ios_12b5044c",
               "path": "Xcode.app"
             }
           ],
@@ -39140,7 +39140,7 @@
           "--out-dir",
           "${ISOLATED_OUTDIR}",
           "--xcode-build-version",
-          "12b5035g",
+          "12b5044c",
           "--xctest"
         ],
         "isolate_name": "ui_base_unittests",
@@ -39165,7 +39165,7 @@
           ],
           "named_caches": [
             {
-              "name": "xcode_ios_12b5035g",
+              "name": "xcode_ios_12b5044c",
               "path": "Xcode.app"
             }
           ],
@@ -39182,7 +39182,7 @@
           "--out-dir",
           "${ISOLATED_OUTDIR}",
           "--xcode-build-version",
-          "12b5035g",
+          "12b5044c",
           "--xctest"
         ],
         "isolate_name": "url_unittests",
@@ -39207,7 +39207,7 @@
           ],
           "named_caches": [
             {
-              "name": "xcode_ios_12b5035g",
+              "name": "xcode_ios_12b5044c",
               "path": "Xcode.app"
             }
           ],
@@ -39231,7 +39231,7 @@
           "--out-dir",
           "${ISOLATED_OUTDIR}",
           "--xcode-build-version",
-          "12b5035g",
+          "12b5044c",
           "--xctest"
         ],
         "isolate_name": "absl_hardening_tests",
@@ -39256,7 +39256,7 @@
           ],
           "named_caches": [
             {
-              "name": "xcode_ios_12b5035g",
+              "name": "xcode_ios_12b5044c",
               "path": "Xcode.app"
             }
           ],
@@ -39273,7 +39273,7 @@
           "--out-dir",
           "${ISOLATED_OUTDIR}",
           "--xcode-build-version",
-          "12b5035g",
+          "12b5044c",
           "--xctest"
         ],
         "isolate_name": "base_unittests",
@@ -39298,7 +39298,7 @@
           ],
           "named_caches": [
             {
-              "name": "xcode_ios_12b5035g",
+              "name": "xcode_ios_12b5044c",
               "path": "Xcode.app"
             }
           ],
@@ -39315,7 +39315,7 @@
           "--out-dir",
           "${ISOLATED_OUTDIR}",
           "--xcode-build-version",
-          "12b5035g",
+          "12b5044c",
           "--xctest"
         ],
         "isolate_name": "base_unittests",
@@ -39340,7 +39340,7 @@
           ],
           "named_caches": [
             {
-              "name": "xcode_ios_12b5035g",
+              "name": "xcode_ios_12b5044c",
               "path": "Xcode.app"
             }
           ],
@@ -39357,7 +39357,7 @@
           "--out-dir",
           "${ISOLATED_OUTDIR}",
           "--xcode-build-version",
-          "12b5035g",
+          "12b5044c",
           "--xctest"
         ],
         "isolate_name": "boringssl_crypto_tests",
@@ -39382,7 +39382,7 @@
           ],
           "named_caches": [
             {
-              "name": "xcode_ios_12b5035g",
+              "name": "xcode_ios_12b5044c",
               "path": "Xcode.app"
             }
           ],
@@ -39399,7 +39399,7 @@
           "--out-dir",
           "${ISOLATED_OUTDIR}",
           "--xcode-build-version",
-          "12b5035g",
+          "12b5044c",
           "--xctest"
         ],
         "isolate_name": "boringssl_ssl_tests",
@@ -39424,7 +39424,7 @@
           ],
           "named_caches": [
             {
-              "name": "xcode_ios_12b5035g",
+              "name": "xcode_ios_12b5044c",
               "path": "Xcode.app"
             }
           ],
@@ -39441,7 +39441,7 @@
           "--out-dir",
           "${ISOLATED_OUTDIR}",
           "--xcode-build-version",
-          "12b5035g",
+          "12b5044c",
           "--xctest"
         ],
         "isolate_name": "components_unittests",
@@ -39466,7 +39466,7 @@
           ],
           "named_caches": [
             {
-              "name": "xcode_ios_12b5035g",
+              "name": "xcode_ios_12b5044c",
               "path": "Xcode.app"
             }
           ],
@@ -39483,7 +39483,7 @@
           "--out-dir",
           "${ISOLATED_OUTDIR}",
           "--xcode-build-version",
-          "12b5035g",
+          "12b5044c",
           "--xctest"
         ],
         "isolate_name": "components_unittests",
@@ -39508,7 +39508,7 @@
           ],
           "named_caches": [
             {
-              "name": "xcode_ios_12b5035g",
+              "name": "xcode_ios_12b5044c",
               "path": "Xcode.app"
             }
           ],
@@ -39525,7 +39525,7 @@
           "--out-dir",
           "${ISOLATED_OUTDIR}",
           "--xcode-build-version",
-          "12b5035g",
+          "12b5044c",
           "--xctest"
         ],
         "isolate_name": "crypto_unittests",
@@ -39550,7 +39550,7 @@
           ],
           "named_caches": [
             {
-              "name": "xcode_ios_12b5035g",
+              "name": "xcode_ios_12b5044c",
               "path": "Xcode.app"
             }
           ],
@@ -39567,7 +39567,7 @@
           "--out-dir",
           "${ISOLATED_OUTDIR}",
           "--xcode-build-version",
-          "12b5035g",
+          "12b5044c",
           "--xctest"
         ],
         "isolate_name": "gfx_unittests",
@@ -39592,7 +39592,7 @@
           ],
           "named_caches": [
             {
-              "name": "xcode_ios_12b5035g",
+              "name": "xcode_ios_12b5044c",
               "path": "Xcode.app"
             }
           ],
@@ -39609,7 +39609,7 @@
           "--out-dir",
           "${ISOLATED_OUTDIR}",
           "--xcode-build-version",
-          "12b5035g",
+          "12b5044c",
           "--xctest"
         ],
         "isolate_name": "gfx_unittests",
@@ -39634,7 +39634,7 @@
           ],
           "named_caches": [
             {
-              "name": "xcode_ios_12b5035g",
+              "name": "xcode_ios_12b5044c",
               "path": "Xcode.app"
             }
           ],
@@ -39651,7 +39651,7 @@
           "--out-dir",
           "${ISOLATED_OUTDIR}",
           "--xcode-build-version",
-          "12b5035g",
+          "12b5044c",
           "--xctest"
         ],
         "isolate_name": "google_apis_unittests",
@@ -39676,7 +39676,7 @@
           ],
           "named_caches": [
             {
-              "name": "xcode_ios_12b5035g",
+              "name": "xcode_ios_12b5044c",
               "path": "Xcode.app"
             }
           ],
@@ -39693,7 +39693,7 @@
           "--out-dir",
           "${ISOLATED_OUTDIR}",
           "--xcode-build-version",
-          "12b5035g",
+          "12b5044c",
           "--xctest",
           "--xcode-parallelization"
         ],
@@ -39719,7 +39719,7 @@
           ],
           "named_caches": [
             {
-              "name": "xcode_ios_12b5035g",
+              "name": "xcode_ios_12b5044c",
               "path": "Xcode.app"
             }
           ],
@@ -39736,7 +39736,7 @@
           "--out-dir",
           "${ISOLATED_OUTDIR}",
           "--xcode-build-version",
-          "12b5035g",
+          "12b5044c",
           "--xctest",
           "--xcode-parallelization"
         ],
@@ -39762,7 +39762,7 @@
           ],
           "named_caches": [
             {
-              "name": "xcode_ios_12b5035g",
+              "name": "xcode_ios_12b5044c",
               "path": "Xcode.app"
             }
           ],
@@ -39779,7 +39779,7 @@
           "--out-dir",
           "${ISOLATED_OUTDIR}",
           "--xcode-build-version",
-          "12b5035g",
+          "12b5044c",
           "--xctest",
           "--xcode-parallelization"
         ],
@@ -39805,7 +39805,7 @@
           ],
           "named_caches": [
             {
-              "name": "xcode_ios_12b5035g",
+              "name": "xcode_ios_12b5044c",
               "path": "Xcode.app"
             }
           ],
@@ -39822,7 +39822,7 @@
           "--out-dir",
           "${ISOLATED_OUTDIR}",
           "--xcode-build-version",
-          "12b5035g",
+          "12b5044c",
           "--xctest",
           "--xcode-parallelization"
         ],
@@ -39848,7 +39848,7 @@
           ],
           "named_caches": [
             {
-              "name": "xcode_ios_12b5035g",
+              "name": "xcode_ios_12b5044c",
               "path": "Xcode.app"
             }
           ],
@@ -39866,7 +39866,7 @@
           "--out-dir",
           "${ISOLATED_OUTDIR}",
           "--xcode-build-version",
-          "12b5035g",
+          "12b5044c",
           "--xctest",
           "--xcode-parallelization"
         ],
@@ -39892,7 +39892,7 @@
           ],
           "named_caches": [
             {
-              "name": "xcode_ios_12b5035g",
+              "name": "xcode_ios_12b5044c",
               "path": "Xcode.app"
             }
           ],
@@ -39910,7 +39910,7 @@
           "--out-dir",
           "${ISOLATED_OUTDIR}",
           "--xcode-build-version",
-          "12b5035g",
+          "12b5044c",
           "--xctest",
           "--xcode-parallelization"
         ],
@@ -39936,7 +39936,7 @@
           ],
           "named_caches": [
             {
-              "name": "xcode_ios_12b5035g",
+              "name": "xcode_ios_12b5044c",
               "path": "Xcode.app"
             }
           ],
@@ -39954,7 +39954,7 @@
           "--out-dir",
           "${ISOLATED_OUTDIR}",
           "--xcode-build-version",
-          "12b5035g",
+          "12b5044c",
           "--xctest",
           "--xcode-parallelization"
         ],
@@ -39980,7 +39980,7 @@
           ],
           "named_caches": [
             {
-              "name": "xcode_ios_12b5035g",
+              "name": "xcode_ios_12b5044c",
               "path": "Xcode.app"
             }
           ],
@@ -39998,7 +39998,7 @@
           "--out-dir",
           "${ISOLATED_OUTDIR}",
           "--xcode-build-version",
-          "12b5035g",
+          "12b5044c",
           "--xctest",
           "--xcode-parallelization"
         ],
@@ -40024,7 +40024,7 @@
           ],
           "named_caches": [
             {
-              "name": "xcode_ios_12b5035g",
+              "name": "xcode_ios_12b5044c",
               "path": "Xcode.app"
             }
           ],
@@ -40042,7 +40042,7 @@
           "--out-dir",
           "${ISOLATED_OUTDIR}",
           "--xcode-build-version",
-          "12b5035g",
+          "12b5044c",
           "--xctest",
           "--xcode-parallelization"
         ],
@@ -40068,7 +40068,7 @@
           ],
           "named_caches": [
             {
-              "name": "xcode_ios_12b5035g",
+              "name": "xcode_ios_12b5044c",
               "path": "Xcode.app"
             }
           ],
@@ -40086,7 +40086,7 @@
           "--out-dir",
           "${ISOLATED_OUTDIR}",
           "--xcode-build-version",
-          "12b5035g",
+          "12b5044c",
           "--xctest",
           "--xcode-parallelization"
         ],
@@ -40112,7 +40112,7 @@
           ],
           "named_caches": [
             {
-              "name": "xcode_ios_12b5035g",
+              "name": "xcode_ios_12b5044c",
               "path": "Xcode.app"
             }
           ],
@@ -40129,7 +40129,7 @@
           "--out-dir",
           "${ISOLATED_OUTDIR}",
           "--xcode-build-version",
-          "12b5035g",
+          "12b5044c",
           "--xctest",
           "--xcode-parallelization"
         ],
@@ -40155,7 +40155,7 @@
           ],
           "named_caches": [
             {
-              "name": "xcode_ios_12b5035g",
+              "name": "xcode_ios_12b5044c",
               "path": "Xcode.app"
             }
           ],
@@ -40172,7 +40172,7 @@
           "--out-dir",
           "${ISOLATED_OUTDIR}",
           "--xcode-build-version",
-          "12b5035g",
+          "12b5044c",
           "--xctest",
           "--xcode-parallelization"
         ],
@@ -40198,7 +40198,7 @@
           ],
           "named_caches": [
             {
-              "name": "xcode_ios_12b5035g",
+              "name": "xcode_ios_12b5044c",
               "path": "Xcode.app"
             }
           ],
@@ -40215,7 +40215,7 @@
           "--out-dir",
           "${ISOLATED_OUTDIR}",
           "--xcode-build-version",
-          "12b5035g",
+          "12b5044c",
           "--xctest",
           "--xcode-parallelization"
         ],
@@ -40241,7 +40241,7 @@
           ],
           "named_caches": [
             {
-              "name": "xcode_ios_12b5035g",
+              "name": "xcode_ios_12b5044c",
               "path": "Xcode.app"
             }
           ],
@@ -40258,7 +40258,7 @@
           "--out-dir",
           "${ISOLATED_OUTDIR}",
           "--xcode-build-version",
-          "12b5035g",
+          "12b5044c",
           "--xctest",
           "--xcode-parallelization"
         ],
@@ -40284,7 +40284,7 @@
           ],
           "named_caches": [
             {
-              "name": "xcode_ios_12b5035g",
+              "name": "xcode_ios_12b5044c",
               "path": "Xcode.app"
             }
           ],
@@ -40301,7 +40301,7 @@
           "--out-dir",
           "${ISOLATED_OUTDIR}",
           "--xcode-build-version",
-          "12b5035g",
+          "12b5044c",
           "--xctest",
           "--xcode-parallelization"
         ],
@@ -40327,7 +40327,7 @@
           ],
           "named_caches": [
             {
-              "name": "xcode_ios_12b5035g",
+              "name": "xcode_ios_12b5044c",
               "path": "Xcode.app"
             }
           ],
@@ -40344,7 +40344,7 @@
           "--out-dir",
           "${ISOLATED_OUTDIR}",
           "--xcode-build-version",
-          "12b5035g",
+          "12b5044c",
           "--xctest",
           "--xcode-parallelization"
         ],
@@ -40370,7 +40370,7 @@
           ],
           "named_caches": [
             {
-              "name": "xcode_ios_12b5035g",
+              "name": "xcode_ios_12b5044c",
               "path": "Xcode.app"
             }
           ],
@@ -40388,7 +40388,7 @@
           "--out-dir",
           "${ISOLATED_OUTDIR}",
           "--xcode-build-version",
-          "12b5035g",
+          "12b5044c",
           "--xctest",
           "--xcode-parallelization"
         ],
@@ -40414,7 +40414,7 @@
           ],
           "named_caches": [
             {
-              "name": "xcode_ios_12b5035g",
+              "name": "xcode_ios_12b5044c",
               "path": "Xcode.app"
             }
           ],
@@ -40432,7 +40432,7 @@
           "--out-dir",
           "${ISOLATED_OUTDIR}",
           "--xcode-build-version",
-          "12b5035g",
+          "12b5044c",
           "--xctest",
           "--xcode-parallelization"
         ],
@@ -40458,7 +40458,7 @@
           ],
           "named_caches": [
             {
-              "name": "xcode_ios_12b5035g",
+              "name": "xcode_ios_12b5044c",
               "path": "Xcode.app"
             }
           ],
@@ -40476,7 +40476,7 @@
           "--out-dir",
           "${ISOLATED_OUTDIR}",
           "--xcode-build-version",
-          "12b5035g",
+          "12b5044c",
           "--xctest"
         ],
         "isolate_name": "ios_chrome_unittests",
@@ -40501,7 +40501,7 @@
           ],
           "named_caches": [
             {
-              "name": "xcode_ios_12b5035g",
+              "name": "xcode_ios_12b5044c",
               "path": "Xcode.app"
             }
           ],
@@ -40518,7 +40518,7 @@
           "--out-dir",
           "${ISOLATED_OUTDIR}",
           "--xcode-build-version",
-          "12b5035g",
+          "12b5044c",
           "--xctest"
         ],
         "isolate_name": "ios_chrome_unittests",
@@ -40543,7 +40543,7 @@
           ],
           "named_caches": [
             {
-              "name": "xcode_ios_12b5035g",
+              "name": "xcode_ios_12b5044c",
               "path": "Xcode.app"
             }
           ],
@@ -40560,7 +40560,7 @@
           "--out-dir",
           "${ISOLATED_OUTDIR}",
           "--xcode-build-version",
-          "12b5035g",
+          "12b5044c",
           "--xctest",
           "--xcode-parallelization"
         ],
@@ -40586,7 +40586,7 @@
           ],
           "named_caches": [
             {
-              "name": "xcode_ios_12b5035g",
+              "name": "xcode_ios_12b5044c",
               "path": "Xcode.app"
             }
           ],
@@ -40603,7 +40603,7 @@
           "--out-dir",
           "${ISOLATED_OUTDIR}",
           "--xcode-build-version",
-          "12b5035g",
+          "12b5044c",
           "--xctest",
           "--xcode-parallelization"
         ],
@@ -40629,7 +40629,7 @@
           ],
           "named_caches": [
             {
-              "name": "xcode_ios_12b5035g",
+              "name": "xcode_ios_12b5044c",
               "path": "Xcode.app"
             }
           ],
@@ -40646,7 +40646,7 @@
           "--out-dir",
           "${ISOLATED_OUTDIR}",
           "--xcode-build-version",
-          "12b5035g",
+          "12b5044c",
           "--xctest",
           "--xcode-parallelization"
         ],
@@ -40672,7 +40672,7 @@
           ],
           "named_caches": [
             {
-              "name": "xcode_ios_12b5035g",
+              "name": "xcode_ios_12b5044c",
               "path": "Xcode.app"
             }
           ],
@@ -40689,7 +40689,7 @@
           "--out-dir",
           "${ISOLATED_OUTDIR}",
           "--xcode-build-version",
-          "12b5035g",
+          "12b5044c",
           "--xctest"
         ],
         "isolate_name": "ios_components_unittests",
@@ -40714,7 +40714,7 @@
           ],
           "named_caches": [
             {
-              "name": "xcode_ios_12b5035g",
+              "name": "xcode_ios_12b5044c",
               "path": "Xcode.app"
             }
           ],
@@ -40731,7 +40731,7 @@
           "--out-dir",
           "${ISOLATED_OUTDIR}",
           "--xcode-build-version",
-          "12b5035g",
+          "12b5044c",
           "--xctest"
         ],
         "isolate_name": "ios_net_unittests",
@@ -40756,7 +40756,7 @@
           ],
           "named_caches": [
             {
-              "name": "xcode_ios_12b5035g",
+              "name": "xcode_ios_12b5044c",
               "path": "Xcode.app"
             }
           ],
@@ -40773,7 +40773,7 @@
           "--out-dir",
           "${ISOLATED_OUTDIR}",
           "--xcode-build-version",
-          "12b5035g",
+          "12b5044c",
           "--xctest"
         ],
         "isolate_name": "ios_remoting_unittests",
@@ -40798,7 +40798,7 @@
           ],
           "named_caches": [
             {
-              "name": "xcode_ios_12b5035g",
+              "name": "xcode_ios_12b5044c",
               "path": "Xcode.app"
             }
           ],
@@ -40815,7 +40815,7 @@
           "--out-dir",
           "${ISOLATED_OUTDIR}",
           "--xcode-build-version",
-          "12b5035g",
+          "12b5044c",
           "--xctest",
           "--xcode-parallelization"
         ],
@@ -40841,7 +40841,7 @@
           ],
           "named_caches": [
             {
-              "name": "xcode_ios_12b5035g",
+              "name": "xcode_ios_12b5044c",
               "path": "Xcode.app"
             }
           ],
@@ -40858,7 +40858,7 @@
           "--out-dir",
           "${ISOLATED_OUTDIR}",
           "--xcode-build-version",
-          "12b5035g",
+          "12b5044c",
           "--xctest",
           "--xcode-parallelization"
         ],
@@ -40884,7 +40884,7 @@
           ],
           "named_caches": [
             {
-              "name": "xcode_ios_12b5035g",
+              "name": "xcode_ios_12b5044c",
               "path": "Xcode.app"
             }
           ],
@@ -40901,7 +40901,7 @@
           "--out-dir",
           "${ISOLATED_OUTDIR}",
           "--xcode-build-version",
-          "12b5035g",
+          "12b5044c",
           "--xctest",
           "--xcode-parallelization"
         ],
@@ -40927,7 +40927,7 @@
           ],
           "named_caches": [
             {
-              "name": "xcode_ios_12b5035g",
+              "name": "xcode_ios_12b5044c",
               "path": "Xcode.app"
             }
           ],
@@ -40944,7 +40944,7 @@
           "--out-dir",
           "${ISOLATED_OUTDIR}",
           "--xcode-build-version",
-          "12b5035g",
+          "12b5044c",
           "--xctest"
         ],
         "isolate_name": "ios_testing_unittests",
@@ -40969,7 +40969,7 @@
           ],
           "named_caches": [
             {
-              "name": "xcode_ios_12b5035g",
+              "name": "xcode_ios_12b5044c",
               "path": "Xcode.app"
             }
           ],
@@ -40986,7 +40986,7 @@
           "--out-dir",
           "${ISOLATED_OUTDIR}",
           "--xcode-build-version",
-          "12b5035g",
+          "12b5044c",
           "--xctest"
         ],
         "isolate_name": "ios_web_inttests",
@@ -41011,7 +41011,7 @@
           ],
           "named_caches": [
             {
-              "name": "xcode_ios_12b5035g",
+              "name": "xcode_ios_12b5044c",
               "path": "Xcode.app"
             }
           ],
@@ -41028,7 +41028,7 @@
           "--out-dir",
           "${ISOLATED_OUTDIR}",
           "--xcode-build-version",
-          "12b5035g",
+          "12b5044c",
           "--xctest"
         ],
         "isolate_name": "ios_web_inttests",
@@ -41053,7 +41053,7 @@
           ],
           "named_caches": [
             {
-              "name": "xcode_ios_12b5035g",
+              "name": "xcode_ios_12b5044c",
               "path": "Xcode.app"
             }
           ],
@@ -41070,7 +41070,7 @@
           "--out-dir",
           "${ISOLATED_OUTDIR}",
           "--xcode-build-version",
-          "12b5035g",
+          "12b5044c",
           "--xctest",
           "--xcode-parallelization"
         ],
@@ -41096,7 +41096,7 @@
           ],
           "named_caches": [
             {
-              "name": "xcode_ios_12b5035g",
+              "name": "xcode_ios_12b5044c",
               "path": "Xcode.app"
             }
           ],
@@ -41113,7 +41113,7 @@
           "--out-dir",
           "${ISOLATED_OUTDIR}",
           "--xcode-build-version",
-          "12b5035g",
+          "12b5044c",
           "--xctest",
           "--xcode-parallelization"
         ],
@@ -41139,7 +41139,7 @@
           ],
           "named_caches": [
             {
-              "name": "xcode_ios_12b5035g",
+              "name": "xcode_ios_12b5044c",
               "path": "Xcode.app"
             }
           ],
@@ -41156,7 +41156,7 @@
           "--out-dir",
           "${ISOLATED_OUTDIR}",
           "--xcode-build-version",
-          "12b5035g",
+          "12b5044c",
           "--xctest",
           "--xcode-parallelization"
         ],
@@ -41182,7 +41182,7 @@
           ],
           "named_caches": [
             {
-              "name": "xcode_ios_12b5035g",
+              "name": "xcode_ios_12b5044c",
               "path": "Xcode.app"
             }
           ],
@@ -41199,7 +41199,7 @@
           "--out-dir",
           "${ISOLATED_OUTDIR}",
           "--xcode-build-version",
-          "12b5035g",
+          "12b5044c",
           "--xctest"
         ],
         "isolate_name": "ios_web_unittests",
@@ -41224,7 +41224,7 @@
           ],
           "named_caches": [
             {
-              "name": "xcode_ios_12b5035g",
+              "name": "xcode_ios_12b5044c",
               "path": "Xcode.app"
             }
           ],
@@ -41241,7 +41241,7 @@
           "--out-dir",
           "${ISOLATED_OUTDIR}",
           "--xcode-build-version",
-          "12b5035g",
+          "12b5044c",
           "--xctest"
         ],
         "isolate_name": "ios_web_unittests",
@@ -41266,7 +41266,7 @@
           ],
           "named_caches": [
             {
-              "name": "xcode_ios_12b5035g",
+              "name": "xcode_ios_12b5044c",
               "path": "Xcode.app"
             }
           ],
@@ -41283,7 +41283,7 @@
           "--out-dir",
           "${ISOLATED_OUTDIR}",
           "--xcode-build-version",
-          "12b5035g",
+          "12b5044c",
           "--xctest"
         ],
         "isolate_name": "ios_web_view_inttests",
@@ -41308,7 +41308,7 @@
           ],
           "named_caches": [
             {
-              "name": "xcode_ios_12b5035g",
+              "name": "xcode_ios_12b5044c",
               "path": "Xcode.app"
             }
           ],
@@ -41325,7 +41325,7 @@
           "--out-dir",
           "${ISOLATED_OUTDIR}",
           "--xcode-build-version",
-          "12b5035g",
+          "12b5044c",
           "--xctest"
         ],
         "isolate_name": "ios_web_view_inttests",
@@ -41350,7 +41350,7 @@
           ],
           "named_caches": [
             {
-              "name": "xcode_ios_12b5035g",
+              "name": "xcode_ios_12b5044c",
               "path": "Xcode.app"
             }
           ],
@@ -41367,7 +41367,7 @@
           "--out-dir",
           "${ISOLATED_OUTDIR}",
           "--xcode-build-version",
-          "12b5035g",
+          "12b5044c",
           "--xctest"
         ],
         "isolate_name": "ios_web_view_unittests",
@@ -41392,7 +41392,7 @@
           ],
           "named_caches": [
             {
-              "name": "xcode_ios_12b5035g",
+              "name": "xcode_ios_12b5044c",
               "path": "Xcode.app"
             }
           ],
@@ -41409,7 +41409,7 @@
           "--out-dir",
           "${ISOLATED_OUTDIR}",
           "--xcode-build-version",
-          "12b5035g",
+          "12b5044c",
           "--xctest"
         ],
         "isolate_name": "ios_web_view_unittests",
@@ -41434,7 +41434,7 @@
           ],
           "named_caches": [
             {
-              "name": "xcode_ios_12b5035g",
+              "name": "xcode_ios_12b5044c",
               "path": "Xcode.app"
             }
           ],
@@ -41451,7 +41451,7 @@
           "--out-dir",
           "${ISOLATED_OUTDIR}",
           "--xcode-build-version",
-          "12b5035g",
+          "12b5044c",
           "--xctest"
         ],
         "isolate_name": "net_unittests",
@@ -41476,7 +41476,7 @@
           ],
           "named_caches": [
             {
-              "name": "xcode_ios_12b5035g",
+              "name": "xcode_ios_12b5044c",
               "path": "Xcode.app"
             }
           ],
@@ -41493,7 +41493,7 @@
           "--out-dir",
           "${ISOLATED_OUTDIR}",
           "--xcode-build-version",
-          "12b5035g",
+          "12b5044c",
           "--xctest"
         ],
         "isolate_name": "services_unittests",
@@ -41518,7 +41518,7 @@
           ],
           "named_caches": [
             {
-              "name": "xcode_ios_12b5035g",
+              "name": "xcode_ios_12b5044c",
               "path": "Xcode.app"
             }
           ],
@@ -41535,7 +41535,7 @@
           "--out-dir",
           "${ISOLATED_OUTDIR}",
           "--xcode-build-version",
-          "12b5035g",
+          "12b5044c",
           "--xctest"
         ],
         "isolate_name": "skia_unittests",
@@ -41560,7 +41560,7 @@
           ],
           "named_caches": [
             {
-              "name": "xcode_ios_12b5035g",
+              "name": "xcode_ios_12b5044c",
               "path": "Xcode.app"
             }
           ],
@@ -41577,7 +41577,7 @@
           "--out-dir",
           "${ISOLATED_OUTDIR}",
           "--xcode-build-version",
-          "12b5035g",
+          "12b5044c",
           "--xctest"
         ],
         "isolate_name": "skia_unittests",
@@ -41602,7 +41602,7 @@
           ],
           "named_caches": [
             {
-              "name": "xcode_ios_12b5035g",
+              "name": "xcode_ios_12b5044c",
               "path": "Xcode.app"
             }
           ],
@@ -41619,7 +41619,7 @@
           "--out-dir",
           "${ISOLATED_OUTDIR}",
           "--xcode-build-version",
-          "12b5035g",
+          "12b5044c",
           "--xctest"
         ],
         "isolate_name": "sql_unittests",
@@ -41644,7 +41644,7 @@
           ],
           "named_caches": [
             {
-              "name": "xcode_ios_12b5035g",
+              "name": "xcode_ios_12b5044c",
               "path": "Xcode.app"
             }
           ],
@@ -41661,7 +41661,7 @@
           "--out-dir",
           "${ISOLATED_OUTDIR}",
           "--xcode-build-version",
-          "12b5035g",
+          "12b5044c",
           "--xctest"
         ],
         "isolate_name": "ui_base_unittests",
@@ -41686,7 +41686,7 @@
           ],
           "named_caches": [
             {
-              "name": "xcode_ios_12b5035g",
+              "name": "xcode_ios_12b5044c",
               "path": "Xcode.app"
             }
           ],
@@ -41703,7 +41703,7 @@
           "--out-dir",
           "${ISOLATED_OUTDIR}",
           "--xcode-build-version",
-          "12b5035g",
+          "12b5044c",
           "--xctest"
         ],
         "isolate_name": "ui_base_unittests",
@@ -41728,7 +41728,7 @@
           ],
           "named_caches": [
             {
-              "name": "xcode_ios_12b5035g",
+              "name": "xcode_ios_12b5044c",
               "path": "Xcode.app"
             }
           ],
@@ -41745,7 +41745,7 @@
           "--out-dir",
           "${ISOLATED_OUTDIR}",
           "--xcode-build-version",
-          "12b5035g",
+          "12b5044c",
           "--xctest"
         ],
         "isolate_name": "url_unittests",
@@ -41770,7 +41770,7 @@
           ],
           "named_caches": [
             {
-              "name": "xcode_ios_12b5035g",
+              "name": "xcode_ios_12b5044c",
               "path": "Xcode.app"
             }
           ],
diff --git a/testing/buildbot/mixins.pyl b/testing/buildbot/mixins.pyl
index 1c0d344..92f6cc4 100644
--- a/testing/buildbot/mixins.pyl
+++ b/testing/buildbot/mixins.pyl
@@ -1075,17 +1075,17 @@
     },
   },
   # latest Xcode 12 beta version.
-  'xcode_12b5035g': {
+  'xcode_12b5044c': {
     '$mixin_append': {
       'args': [
         '--xcode-build-version',
-        '12b5035g'
+        '12b5044c'
       ],
     },
     'swarming': {
       'named_caches': [
         {
-          'name': 'xcode_ios_12b5035g',
+          'name': 'xcode_ios_12b5044c',
           'path': 'Xcode.app',
         },
       ],
diff --git a/testing/buildbot/waterfalls.pyl b/testing/buildbot/waterfalls.pyl
index 8e6b8ad..419fc4f6 100644
--- a/testing/buildbot/waterfalls.pyl
+++ b/testing/buildbot/waterfalls.pyl
@@ -2474,7 +2474,7 @@
           'mac_10.15',
           'mac_toolchain',
           'out_dir_arg',
-          'xcode_12b5035g',
+          'xcode_12b5044c',
           'xctest',
         ],
         'test_suites': {
@@ -2491,7 +2491,7 @@
           'mac_10.15',
           'mac_toolchain',
           'out_dir_arg',
-          'xcode_12b5035g',
+          'xcode_12b5044c',
           'xctest',
         ],
         'test_suites': {