From d10569f6f815031178864676d49f3568e94a2097 Mon Sep 17 00:00:00 2001
From: Godofredo Contreras <godofredoc@google.com>
Date: Thu, 15 Jun 2023 16:59:54 -0700
Subject: [PATCH] Set xcode explicitly on mac builds with release_build.

Xcode version needs to be set explicitly for builds running on
dart-internal.

Bug: https://github.com/flutter/flutter/issues/128977
---
 .ci.yaml                         |  8 ++++++++
 ci/builders/mac_host_engine.json | 30 ++++++++++++++++++++++++++++++
 ci/builders/mac_ios_engine.json  | 25 +++++++++++++++++++++++++
 3 files changed, 63 insertions(+)

diff --git a/.ci.yaml b/.ci.yaml
index 02f35d27b0b31..bc69889a7f1ce 100644
--- a/.ci.yaml
+++ b/.ci.yaml
@@ -514,6 +514,10 @@ targets:
         [
           {"dependency": "goldctl", "version": "git_revision:f808dcff91b221ae313e540c09d79696cd08b8de"}
         ]
+      $flutter/osx_sdk : >-
+        {
+          "sdk_version": "14e222b"
+        }
     drone_dimensions:
       - os=Mac-12
 
@@ -604,6 +608,10 @@ targets:
         [
           {"dependency": "jazzy", "version": "0.14.1"}
         ]
+      $flutter/osx_sdk : >-
+        {
+          "sdk_version": "14e222b"
+        }
     drone_dimensions:
       - os=Mac-12
       - cpu=x86
diff --git a/ci/builders/mac_host_engine.json b/ci/builders/mac_host_engine.json
index 79ce54e95b16b..ca3d35cd0c667 100644
--- a/ci/builders/mac_host_engine.json
+++ b/ci/builders/mac_host_engine.json
@@ -45,6 +45,11 @@
                     "flutter:unittests"
                 ]
             },
+            "properties": {
+                "$flutter/osx_sdk": {
+                    "sdk_version": "14e222b"
+                }
+            },
             "tests": [
                 {
                     "language": "python3",
@@ -99,6 +104,11 @@
                     "flutter:unittests"
                 ]
             },
+            "properties": {
+                "$flutter/osx_sdk": {
+                    "sdk_version": "14e222b"
+                }
+            },
             "tests": [
                 {
                     "language": "python3",
@@ -164,6 +174,11 @@
                     "flutter:unittests"
                 ]
             },
+            "properties": {
+                "$flutter/osx_sdk": {
+                    "sdk_version": "14e222b"
+                }
+            },
             "tests": [
                 {
                     "language": "python3",
@@ -219,6 +234,11 @@
                     "flutter/build/archives:flutter_embedder_framework",
                     "flutter/shell/platform/darwin/macos:zip_macos_flutter_framework"
                 ]
+            },
+            "properties": {
+                "$flutter/osx_sdk": {
+                    "sdk_version": "14e222b"
+                }
             }
         },
         {
@@ -257,6 +277,11 @@
                     "flutter/build/archives:artifacts",
                     "flutter/shell/platform/darwin/macos:zip_macos_flutter_framework"
                 ]
+            },
+            "properties": {
+                "$flutter/osx_sdk": {
+                    "sdk_version": "14e222b"
+                }
             }
         },
         {
@@ -297,6 +322,11 @@
                     "flutter/build/archives:artifacts",
                     "flutter/shell/platform/darwin/macos:zip_macos_flutter_framework"
                 ]
+            },
+            "properties": {
+                "$flutter/osx_sdk": {
+                    "sdk_version": "14e222b"
+                }
             }
         }
     ],
diff --git a/ci/builders/mac_ios_engine.json b/ci/builders/mac_ios_engine.json
index 9af381cae2ba4..29537b7a700b1 100644
--- a/ci/builders/mac_ios_engine.json
+++ b/ci/builders/mac_ios_engine.json
@@ -16,6 +16,11 @@
             "name": "ios_debug_sim",
             "ninja": {
                 "config": "ios_debug_sim"
+            },
+            "properties": {
+                "$flutter/osx_sdk": {
+                    "sdk_version": "14e222b"
+                }
             }
         },
         {
@@ -35,6 +40,11 @@
             "name": "ios_debug_sim_arm64",
             "ninja": {
                 "config": "ios_debug_sim_arm64"
+            },
+            "properties": {
+                "$flutter/osx_sdk": {
+                    "sdk_version": "14e222b"
+                }
             }
         },
         {
@@ -54,6 +64,11 @@
                 "targets": [
                     "flutter/shell/platform/darwin/ios:flutter_framework"
                 ]
+            },
+            "properties": {
+                "$flutter/osx_sdk": {
+                    "sdk_version": "14e222b"
+                }
             }
         },
         {
@@ -74,6 +89,11 @@
                     "flutter/shell/platform/darwin/ios:flutter_framework",
                     "flutter/lib/snapshot:generate_snapshot_bin"
                 ]
+            },
+            "properties": {
+                "$flutter/osx_sdk": {
+                    "sdk_version": "14e222b"
+                }
             }
         },
         {
@@ -94,6 +114,11 @@
                     "flutter/shell/platform/darwin/ios:flutter_framework",
                     "flutter/lib/snapshot:generate_snapshot_bin"
                 ]
+            },
+            "properties": {
+                "$flutter/osx_sdk": {
+                    "sdk_version": "14e222b"
+                }
             }
         }
     ],