From 3f230c05c2d46bd0be87848ff8096903b377de52 Mon Sep 17 00:00:00 2001 From: Victoria Ashworth Date: Fri, 16 Jun 2023 13:09:13 -0500 Subject: [PATCH 1/3] Update Xcode to 14.3.1 --- .ci.yaml | 10 +++++----- ci/builders/README.md | 6 +++--- ci/builders/mac_android_aot_engine.json | 12 ++++++------ ci/builders/mac_host_engine.json | 12 ++++++------ ci/builders/mac_ios_engine.json | 10 +++++----- ci/builders/mac_unopt.json | 12 ++++++------ 6 files changed, 31 insertions(+), 31 deletions(-) diff --git a/.ci.yaml b/.ci.yaml index 6974c5f2f2002..0b393d8abf4d1 100644 --- a/.ci.yaml +++ b/.ci.yaml @@ -56,7 +56,7 @@ platform_properties: os: Mac-12 $flutter/osx_sdk : >- { - "sdk_version": "14e222b" + "sdk_version": "14e300c" } dimensions: mac_model: "Macmini8,1|Macmini9,1" @@ -515,7 +515,7 @@ targets: ] $flutter/osx_sdk : >- { - "sdk_version": "14e222b" + "sdk_version": "14e300c" } drone_dimensions: - os=Mac-12 @@ -533,10 +533,10 @@ targets: properties: $flutter/osx_sdk : >- { - "sdk_version": "14e222b", + "sdk_version": "14e300c", "runtime_versions": [ - "ios-16-4_14e222b", + "ios-16-4_14e300c", "ios-16-2_14c18" ] } @@ -609,7 +609,7 @@ targets: ] $flutter/osx_sdk : >- { - "sdk_version": "14e222b" + "sdk_version": "14e300c" } drone_dimensions: - os=Mac-12 diff --git a/ci/builders/README.md b/ci/builders/README.md index eb715a8c5b1e7..5bf3cc18de2aa 100644 --- a/ci/builders/README.md +++ b/ci/builders/README.md @@ -5,7 +5,7 @@ by defining a combination of *sub-builds*, *archives*, *generators* and *depende makes it simple to shard sub-builds by mapping build inputs to workflows, and listing the sub-build-generated artifacts explicitly. The Build Definition Language, Engine Recipes V2 and the generation of artifacts using GN+Ninja set the groundwork -for efficient builds with dependency reusability. +for efficient builds with dependency reusability. **Author: Godofredo Contreras (godofredoc)**\ **Go Link: flutter.dev/go/engine-build-definition-language**\ @@ -56,7 +56,7 @@ in the `config_name` under `properties`: properties: config_name: mac_android_aot_engine $flutter/osx_sdk : >- - { "sdk_version": "14e222b" } + { "sdk_version": "14e300c" } ``` @@ -458,7 +458,7 @@ Engine test example: "max_attempts": 1, "script": "flutter/ci/lint.sh" } - ] + ] } ] } diff --git a/ci/builders/mac_android_aot_engine.json b/ci/builders/mac_android_aot_engine.json index 3ab49c865ceea..20dd187c19775 100644 --- a/ci/builders/mac_android_aot_engine.json +++ b/ci/builders/mac_android_aot_engine.json @@ -35,7 +35,7 @@ }, "properties": { "$flutter/osx_sdk": { - "sdk_version": "14e222b" + "sdk_version": "14e300c" } } }, @@ -75,7 +75,7 @@ }, "properties": { "$flutter/osx_sdk": { - "sdk_version": "14e222b" + "sdk_version": "14e300c" } } }, @@ -115,7 +115,7 @@ }, "properties": { "$flutter/osx_sdk": { - "sdk_version": "14e222b" + "sdk_version": "14e300c" } } }, @@ -154,7 +154,7 @@ }, "properties": { "$flutter/osx_sdk": { - "sdk_version": "14e222b" + "sdk_version": "14e300c" } } }, @@ -194,7 +194,7 @@ }, "properties": { "$flutter/osx_sdk": { - "sdk_version": "14e222b" + "sdk_version": "14e300c" } } }, @@ -234,7 +234,7 @@ }, "properties": { "$flutter/osx_sdk": { - "sdk_version": "14e222b" + "sdk_version": "14e300c" } } } diff --git a/ci/builders/mac_host_engine.json b/ci/builders/mac_host_engine.json index ca3d35cd0c667..cc3a336302a50 100644 --- a/ci/builders/mac_host_engine.json +++ b/ci/builders/mac_host_engine.json @@ -47,7 +47,7 @@ }, "properties": { "$flutter/osx_sdk": { - "sdk_version": "14e222b" + "sdk_version": "14e300c" } }, "tests": [ @@ -106,7 +106,7 @@ }, "properties": { "$flutter/osx_sdk": { - "sdk_version": "14e222b" + "sdk_version": "14e300c" } }, "tests": [ @@ -176,7 +176,7 @@ }, "properties": { "$flutter/osx_sdk": { - "sdk_version": "14e222b" + "sdk_version": "14e300c" } }, "tests": [ @@ -237,7 +237,7 @@ }, "properties": { "$flutter/osx_sdk": { - "sdk_version": "14e222b" + "sdk_version": "14e300c" } } }, @@ -280,7 +280,7 @@ }, "properties": { "$flutter/osx_sdk": { - "sdk_version": "14e222b" + "sdk_version": "14e300c" } } }, @@ -325,7 +325,7 @@ }, "properties": { "$flutter/osx_sdk": { - "sdk_version": "14e222b" + "sdk_version": "14e300c" } } } diff --git a/ci/builders/mac_ios_engine.json b/ci/builders/mac_ios_engine.json index 29537b7a700b1..ec58321c7fc22 100644 --- a/ci/builders/mac_ios_engine.json +++ b/ci/builders/mac_ios_engine.json @@ -19,7 +19,7 @@ }, "properties": { "$flutter/osx_sdk": { - "sdk_version": "14e222b" + "sdk_version": "14e300c" } } }, @@ -43,7 +43,7 @@ }, "properties": { "$flutter/osx_sdk": { - "sdk_version": "14e222b" + "sdk_version": "14e300c" } } }, @@ -67,7 +67,7 @@ }, "properties": { "$flutter/osx_sdk": { - "sdk_version": "14e222b" + "sdk_version": "14e300c" } } }, @@ -92,7 +92,7 @@ }, "properties": { "$flutter/osx_sdk": { - "sdk_version": "14e222b" + "sdk_version": "14e300c" } } }, @@ -117,7 +117,7 @@ }, "properties": { "$flutter/osx_sdk": { - "sdk_version": "14e222b" + "sdk_version": "14e300c" } } } diff --git a/ci/builders/mac_unopt.json b/ci/builders/mac_unopt.json index 75e6043e03337..72778ab4df159 100644 --- a/ci/builders/mac_unopt.json +++ b/ci/builders/mac_unopt.json @@ -32,7 +32,7 @@ }, "properties": { "$flutter/osx_sdk": { - "sdk_version": "14e222b" + "sdk_version": "14e300c" } }, "tests": [ @@ -62,10 +62,10 @@ "properties": { "$flutter/osx_sdk": { "runtime_versions": [ - "ios-16-4_14e222b", + "ios-16-4_14e300c", "ios-16-2_14c18" ], - "sdk_version": "14e222b" + "sdk_version": "14e300c" } }, "drone_dimensions": [ @@ -151,7 +151,7 @@ }, "properties": { "$flutter/osx_sdk": { - "sdk_version": "14e222b" + "sdk_version": "14e300c" } } }, @@ -168,10 +168,10 @@ "properties": { "$flutter/osx_sdk": { "runtime_versions": [ - "ios-16-4_14e222b", + "ios-16-4_14e300c", "ios-16-2_14c18" ], - "sdk_version": "14e222b" + "sdk_version": "14e300c" } }, "drone_dimensions": [ From ce3814f015c78d784593074ef9a669bc8bd96c76 Mon Sep 17 00:00:00 2001 From: Zachary Anderson Date: Thu, 22 Jun 2023 09:09:21 -0700 Subject: [PATCH 2/3] Pass --verbose to the clang_tidy script --- ci/lint.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/ci/lint.sh b/ci/lint.sh index adfc2be39c8f9..f55eaf96d91a3 100755 --- a/ci/lint.sh +++ b/ci/lint.sh @@ -53,6 +53,7 @@ cd "$SCRIPT_DIR" "$DART" \ --disable-dart-dev \ "$SRC_DIR/flutter/tools/clang_tidy/bin/main.dart" \ + --verbose \ --src-dir="$SRC_DIR" \ $fix_flag \ "$@" && true # errors ignored From bb7e373ebbe290fbf76128011c2925281022d293 Mon Sep 17 00:00:00 2001 From: Victoria Ashworth Date: Mon, 26 Jun 2023 16:48:33 -0500 Subject: [PATCH 3/3] remove verbose --- ci/lint.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/ci/lint.sh b/ci/lint.sh index f55eaf96d91a3..adfc2be39c8f9 100755 --- a/ci/lint.sh +++ b/ci/lint.sh @@ -53,7 +53,6 @@ cd "$SCRIPT_DIR" "$DART" \ --disable-dart-dev \ "$SRC_DIR/flutter/tools/clang_tidy/bin/main.dart" \ - --verbose \ --src-dir="$SRC_DIR" \ $fix_flag \ "$@" && true # errors ignored