Skip to content

Commit 6f14c96

Browse files
LouiseHsuLouiseHsu
authored
Fix codesigning for Mac_arm64_ios imitation_game_flutter (flutter#167307)
https://ci.chromium.org/ui/p/flutter/builders/luci.flutter.staging/Mac_arm64_ios%20imitation_game_flutter The swiftui benchmark has been failing in bring up because the project wasnt getting correctly codesigned. Also, fixes the fact that I flipped the naming of imitation_game_flutter and imitation_game_swiftui 😶‍🌫️ Also removes extraneous targets from the project https://ci.chromium.org/ui/p/flutter/builders/try.shadow/Mac_arm64_ios%20imitation_game_flutter/14/overview Tested with `led`, proof that it's working post this PR ^ ## Pre-launch Checklist - [x] I read the [Contributor Guide] and followed the process outlined there for submitting PRs. - [x] I read the [Tree Hygiene] wiki page, which explains my responsibilities. - [x] I read and followed the [Flutter Style Guide], including [Features we expect every widget to implement]. - [x] I signed the [CLA]. - [x] I listed at least one issue that this PR fixes in the description above. - [x] I updated/added relevant documentation (doc comments with `///`). - [x] I added new tests to check the change I am making, or this PR is [test-exempt]. - [x] I followed the [breaking change policy] and added [Data Driven Fixes] where supported. - [x] All existing and new tests are passing.
1 parent 7f136e2 commit 6f14c96

File tree

3 files changed

+18
-214
lines changed

3 files changed

+18
-214
lines changed

‎.ci.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5021,7 +5021,7 @@ targets:
50215021
properties:
50225022
tags: >
50235023
["devicelab", "ios", "mac", "arm64"]
5024-
task_name: imitation_game_swiftui__compile
5024+
task_name: imitation_game_flutter__compile
50255025

50265026
- name: Mac_arm64_ios imitation_game_swiftui
50275027
recipe: devicelab/devicelab_drone
@@ -5031,7 +5031,7 @@ targets:
50315031
properties:
50325032
tags: >
50335033
["devicelab", "ios", "mac", "arm64"]
5034-
task_name: imitation_game_flutter__compile
5034+
task_name: imitation_game_swiftui__compile
50355035

50365036
- name: Mac_x64 hot_mode_dev_cycle_macos_target__benchmark
50375037
recipe: devicelab/devicelab_drone

‎dev/benchmarks/imitation_game_swiftui/hello_world_swiftui.xcodeproj/project.pbxproj‎

Lines changed: 6 additions & 212 deletions
Original file line numberDiff line numberDiff line change
@@ -13,31 +13,12 @@
1313
F241F50D2D08EE8900C053B5 /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = F241F50C2D08EE8900C053B5 /* Preview Assets.xcassets */; };
1414
/* End PBXBuildFile section */
1515

16-
/* Begin PBXContainerItemProxy section */
17-
F241F5132D08EE8900C053B5 /* PBXContainerItemProxy */ = {
18-
isa = PBXContainerItemProxy;
19-
containerPortal = F241F4FA2D08EE8800C053B5 /* Project object */;
20-
proxyType = 1;
21-
remoteGlobalIDString = F241F5012D08EE8800C053B5;
22-
remoteInfo = hello_world_swiftui;
23-
};
24-
F241F51D2D08EE8900C053B5 /* PBXContainerItemProxy */ = {
25-
isa = PBXContainerItemProxy;
26-
containerPortal = F241F4FA2D08EE8800C053B5 /* Project object */;
27-
proxyType = 1;
28-
remoteGlobalIDString = F241F5012D08EE8800C053B5;
29-
remoteInfo = hello_world_swiftui;
30-
};
31-
/* End PBXContainerItemProxy section */
32-
3316
/* Begin PBXFileReference section */
3417
F241F5022D08EE8800C053B5 /* hello_world_swiftui.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = hello_world_swiftui.app; sourceTree = BUILT_PRODUCTS_DIR; };
3518
F241F5052D08EE8800C053B5 /* hello_world_swiftuiApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = hello_world_swiftuiApp.swift; sourceTree = "<group>"; };
3619
F241F5072D08EE8800C053B5 /* ContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = "<group>"; };
3720
F241F5092D08EE8900C053B5 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
3821
F241F50C2D08EE8900C053B5 /* Preview Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = "Preview Assets.xcassets"; sourceTree = "<group>"; };
39-
F241F5122D08EE8900C053B5 /* hello_world_swiftuiTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = hello_world_swiftuiTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
40-
F241F51C2D08EE8900C053B5 /* hello_world_swiftuiUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = hello_world_swiftuiUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
4122
/* End PBXFileReference section */
4223

4324
/* Begin PBXFrameworksBuildPhase section */
@@ -48,20 +29,6 @@
4829
);
4930
runOnlyForDeploymentPostprocessing = 0;
5031
};
51-
F241F50F2D08EE8900C053B5 /* Frameworks */ = {
52-
isa = PBXFrameworksBuildPhase;
53-
buildActionMask = 2147483647;
54-
files = (
55-
);
56-
runOnlyForDeploymentPostprocessing = 0;
57-
};
58-
F241F5192D08EE8900C053B5 /* Frameworks */ = {
59-
isa = PBXFrameworksBuildPhase;
60-
buildActionMask = 2147483647;
61-
files = (
62-
);
63-
runOnlyForDeploymentPostprocessing = 0;
64-
};
6532
/* End PBXFrameworksBuildPhase section */
6633

6734
/* Begin PBXGroup section */
@@ -77,8 +44,6 @@
7744
isa = PBXGroup;
7845
children = (
7946
F241F5022D08EE8800C053B5 /* hello_world_swiftui.app */,
80-
F241F5122D08EE8900C053B5 /* hello_world_swiftuiTests.xctest */,
81-
F241F51C2D08EE8900C053B5 /* hello_world_swiftuiUITests.xctest */,
8247
);
8348
name = Products;
8449
sourceTree = "<group>";
@@ -122,42 +87,6 @@
12287
productReference = F241F5022D08EE8800C053B5 /* hello_world_swiftui.app */;
12388
productType = "com.apple.product-type.application";
12489
};
125-
F241F5112D08EE8900C053B5 /* hello_world_swiftuiTests */ = {
126-
isa = PBXNativeTarget;
127-
buildConfigurationList = F241F5292D08EE8900C053B5 /* Build configuration list for PBXNativeTarget "hello_world_swiftuiTests" */;
128-
buildPhases = (
129-
F241F50E2D08EE8900C053B5 /* Sources */,
130-
F241F50F2D08EE8900C053B5 /* Frameworks */,
131-
F241F5102D08EE8900C053B5 /* Resources */,
132-
);
133-
buildRules = (
134-
);
135-
dependencies = (
136-
F241F5142D08EE8900C053B5 /* PBXTargetDependency */,
137-
);
138-
name = hello_world_swiftuiTests;
139-
productName = hello_world_swiftuiTests;
140-
productReference = F241F5122D08EE8900C053B5 /* hello_world_swiftuiTests.xctest */;
141-
productType = "com.apple.product-type.bundle.unit-test";
142-
};
143-
F241F51B2D08EE8900C053B5 /* hello_world_swiftuiUITests */ = {
144-
isa = PBXNativeTarget;
145-
buildConfigurationList = F241F52C2D08EE8900C053B5 /* Build configuration list for PBXNativeTarget "hello_world_swiftuiUITests" */;
146-
buildPhases = (
147-
F241F5182D08EE8900C053B5 /* Sources */,
148-
F241F5192D08EE8900C053B5 /* Frameworks */,
149-
F241F51A2D08EE8900C053B5 /* Resources */,
150-
);
151-
buildRules = (
152-
);
153-
dependencies = (
154-
F241F51E2D08EE8900C053B5 /* PBXTargetDependency */,
155-
);
156-
name = hello_world_swiftuiUITests;
157-
productName = hello_world_swiftuiUITests;
158-
productReference = F241F51C2D08EE8900C053B5 /* hello_world_swiftuiUITests.xctest */;
159-
productType = "com.apple.product-type.bundle.ui-testing";
160-
};
16190
/* End PBXNativeTarget section */
16291

16392
/* Begin PBXProject section */
@@ -171,14 +100,6 @@
171100
F241F5012D08EE8800C053B5 = {
172101
CreatedOnToolsVersion = 15.4;
173102
};
174-
F241F5112D08EE8900C053B5 = {
175-
CreatedOnToolsVersion = 15.4;
176-
TestTargetID = F241F5012D08EE8800C053B5;
177-
};
178-
F241F51B2D08EE8900C053B5 = {
179-
CreatedOnToolsVersion = 15.4;
180-
TestTargetID = F241F5012D08EE8800C053B5;
181-
};
182103
};
183104
};
184105
buildConfigurationList = F241F4FD2D08EE8800C053B5 /* Build configuration list for PBXProject "hello_world_swiftui" */;
@@ -195,8 +116,6 @@
195116
projectRoot = "";
196117
targets = (
197118
F241F5012D08EE8800C053B5 /* hello_world_swiftui */,
198-
F241F5112D08EE8900C053B5 /* hello_world_swiftuiTests */,
199-
F241F51B2D08EE8900C053B5 /* hello_world_swiftuiUITests */,
200119
);
201120
};
202121
/* End PBXProject section */
@@ -211,20 +130,6 @@
211130
);
212131
runOnlyForDeploymentPostprocessing = 0;
213132
};
214-
F241F5102D08EE8900C053B5 /* Resources */ = {
215-
isa = PBXResourcesBuildPhase;
216-
buildActionMask = 2147483647;
217-
files = (
218-
);
219-
runOnlyForDeploymentPostprocessing = 0;
220-
};
221-
F241F51A2D08EE8900C053B5 /* Resources */ = {
222-
isa = PBXResourcesBuildPhase;
223-
buildActionMask = 2147483647;
224-
files = (
225-
);
226-
runOnlyForDeploymentPostprocessing = 0;
227-
};
228133
/* End PBXResourcesBuildPhase section */
229134

230135
/* Begin PBXSourcesBuildPhase section */
@@ -237,35 +142,8 @@
237142
);
238143
runOnlyForDeploymentPostprocessing = 0;
239144
};
240-
F241F50E2D08EE8900C053B5 /* Sources */ = {
241-
isa = PBXSourcesBuildPhase;
242-
buildActionMask = 2147483647;
243-
files = (
244-
);
245-
runOnlyForDeploymentPostprocessing = 0;
246-
};
247-
F241F5182D08EE8900C053B5 /* Sources */ = {
248-
isa = PBXSourcesBuildPhase;
249-
buildActionMask = 2147483647;
250-
files = (
251-
);
252-
runOnlyForDeploymentPostprocessing = 0;
253-
};
254145
/* End PBXSourcesBuildPhase section */
255146

256-
/* Begin PBXTargetDependency section */
257-
F241F5142D08EE8900C053B5 /* PBXTargetDependency */ = {
258-
isa = PBXTargetDependency;
259-
target = F241F5012D08EE8800C053B5 /* hello_world_swiftui */;
260-
targetProxy = F241F5132D08EE8900C053B5 /* PBXContainerItemProxy */;
261-
};
262-
F241F51E2D08EE8900C053B5 /* PBXTargetDependency */ = {
263-
isa = PBXTargetDependency;
264-
target = F241F5012D08EE8800C053B5 /* hello_world_swiftui */;
265-
targetProxy = F241F51D2D08EE8900C053B5 /* PBXContainerItemProxy */;
266-
};
267-
/* End PBXTargetDependency section */
268-
269147
/* Begin XCBuildConfiguration section */
270148
F241F5242D08EE8900C053B5 /* Debug */ = {
271149
isa = XCBuildConfiguration;
@@ -302,6 +180,7 @@
302180
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
303181
COPY_PHASE_STRIP = NO;
304182
DEBUG_INFORMATION_FORMAT = dwarf;
183+
DEVELOPMENT_TEAM = S8QB4VV633;
305184
ENABLE_STRICT_OBJC_MSGSEND = YES;
306185
ENABLE_TESTABILITY = YES;
307186
ENABLE_USER_SCRIPT_SANDBOXING = YES;
@@ -365,6 +244,7 @@
365244
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
366245
COPY_PHASE_STRIP = NO;
367246
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
247+
DEVELOPMENT_TEAM = S8QB4VV633;
368248
ENABLE_NS_ASSERTIONS = NO;
369249
ENABLE_STRICT_OBJC_MSGSEND = YES;
370250
ENABLE_USER_SCRIPT_SANDBOXING = YES;
@@ -391,6 +271,7 @@
391271
buildSettings = {
392272
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
393273
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
274+
CODE_SIGN_IDENTITY = "Apple Development";
394275
CODE_SIGN_STYLE = Automatic;
395276
CURRENT_PROJECT_VERSION = 1;
396277
DEVELOPMENT_ASSET_PATHS = "\"hello_world_swiftui/Preview Content\"";
@@ -410,6 +291,7 @@
410291
MARKETING_VERSION = 1.0;
411292
PRODUCT_BUNDLE_IDENTIFIER = "dev.flutter.plugins.hello-world-swiftui";
412293
PRODUCT_NAME = "$(TARGET_NAME)";
294+
PROVISIONING_PROFILE_SPECIFIER = "";
413295
SWIFT_EMIT_LOC_STRINGS = YES;
414296
SWIFT_VERSION = 5.0;
415297
TARGETED_DEVICE_FAMILY = "1,2";
@@ -421,6 +303,7 @@
421303
buildSettings = {
422304
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
423305
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
306+
CODE_SIGN_IDENTITY = "Apple Development";
424307
CODE_SIGN_STYLE = Automatic;
425308
CURRENT_PROJECT_VERSION = 1;
426309
DEVELOPMENT_ASSET_PATHS = "\"hello_world_swiftui/Preview Content\"";
@@ -440,84 +323,13 @@
440323
MARKETING_VERSION = 1.0;
441324
PRODUCT_BUNDLE_IDENTIFIER = "dev.flutter.plugins.hello-world-swiftui";
442325
PRODUCT_NAME = "$(TARGET_NAME)";
326+
PROVISIONING_PROFILE_SPECIFIER = "";
443327
SWIFT_EMIT_LOC_STRINGS = YES;
444328
SWIFT_VERSION = 5.0;
445329
TARGETED_DEVICE_FAMILY = "1,2";
446330
};
447331
name = Release;
448332
};
449-
F241F52A2D08EE8900C053B5 /* Debug */ = {
450-
isa = XCBuildConfiguration;
451-
buildSettings = {
452-
BUNDLE_LOADER = "$(TEST_HOST)";
453-
CODE_SIGN_STYLE = Automatic;
454-
CURRENT_PROJECT_VERSION = 1;
455-
DEVELOPMENT_TEAM = S8QB4VV633;
456-
GENERATE_INFOPLIST_FILE = YES;
457-
IPHONEOS_DEPLOYMENT_TARGET = 17.5;
458-
MARKETING_VERSION = 1.0;
459-
PRODUCT_BUNDLE_IDENTIFIER = "dev.flutter.plugins.hello-world-swiftuiTests";
460-
PRODUCT_NAME = "$(TARGET_NAME)";
461-
SWIFT_EMIT_LOC_STRINGS = NO;
462-
SWIFT_VERSION = 5.0;
463-
TARGETED_DEVICE_FAMILY = "1,2";
464-
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/hello_world_swiftui.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/hello_world_swiftui";
465-
};
466-
name = Debug;
467-
};
468-
F241F52B2D08EE8900C053B5 /* Release */ = {
469-
isa = XCBuildConfiguration;
470-
buildSettings = {
471-
BUNDLE_LOADER = "$(TEST_HOST)";
472-
CODE_SIGN_STYLE = Automatic;
473-
CURRENT_PROJECT_VERSION = 1;
474-
DEVELOPMENT_TEAM = S8QB4VV633;
475-
GENERATE_INFOPLIST_FILE = YES;
476-
IPHONEOS_DEPLOYMENT_TARGET = 17.5;
477-
MARKETING_VERSION = 1.0;
478-
PRODUCT_BUNDLE_IDENTIFIER = "dev.flutter.plugins.hello-world-swiftuiTests";
479-
PRODUCT_NAME = "$(TARGET_NAME)";
480-
SWIFT_EMIT_LOC_STRINGS = NO;
481-
SWIFT_VERSION = 5.0;
482-
TARGETED_DEVICE_FAMILY = "1,2";
483-
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/hello_world_swiftui.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/hello_world_swiftui";
484-
};
485-
name = Release;
486-
};
487-
F241F52D2D08EE8900C053B5 /* Debug */ = {
488-
isa = XCBuildConfiguration;
489-
buildSettings = {
490-
CODE_SIGN_STYLE = Automatic;
491-
CURRENT_PROJECT_VERSION = 1;
492-
DEVELOPMENT_TEAM = S8QB4VV633;
493-
GENERATE_INFOPLIST_FILE = YES;
494-
MARKETING_VERSION = 1.0;
495-
PRODUCT_BUNDLE_IDENTIFIER = "dev.flutter.plugins.hello-world-swiftuiUITests";
496-
PRODUCT_NAME = "$(TARGET_NAME)";
497-
SWIFT_EMIT_LOC_STRINGS = NO;
498-
SWIFT_VERSION = 5.0;
499-
TARGETED_DEVICE_FAMILY = "1,2";
500-
TEST_TARGET_NAME = hello_world_swiftui;
501-
};
502-
name = Debug;
503-
};
504-
F241F52E2D08EE8900C053B5 /* Release */ = {
505-
isa = XCBuildConfiguration;
506-
buildSettings = {
507-
CODE_SIGN_STYLE = Automatic;
508-
CURRENT_PROJECT_VERSION = 1;
509-
DEVELOPMENT_TEAM = S8QB4VV633;
510-
GENERATE_INFOPLIST_FILE = YES;
511-
MARKETING_VERSION = 1.0;
512-
PRODUCT_BUNDLE_IDENTIFIER = "dev.flutter.plugins.hello-world-swiftuiUITests";
513-
PRODUCT_NAME = "$(TARGET_NAME)";
514-
SWIFT_EMIT_LOC_STRINGS = NO;
515-
SWIFT_VERSION = 5.0;
516-
TARGETED_DEVICE_FAMILY = "1,2";
517-
TEST_TARGET_NAME = hello_world_swiftui;
518-
};
519-
name = Release;
520-
};
521333
/* End XCBuildConfiguration section */
522334

523335
/* Begin XCConfigurationList section */
@@ -539,24 +351,6 @@
539351
defaultConfigurationIsVisible = 0;
540352
defaultConfigurationName = Release;
541353
};
542-
F241F5292D08EE8900C053B5 /* Build configuration list for PBXNativeTarget "hello_world_swiftuiTests" */ = {
543-
isa = XCConfigurationList;
544-
buildConfigurations = (
545-
F241F52A2D08EE8900C053B5 /* Debug */,
546-
F241F52B2D08EE8900C053B5 /* Release */,
547-
);
548-
defaultConfigurationIsVisible = 0;
549-
defaultConfigurationName = Release;
550-
};
551-
F241F52C2D08EE8900C053B5 /* Build configuration list for PBXNativeTarget "hello_world_swiftuiUITests" */ = {
552-
isa = XCConfigurationList;
553-
buildConfigurations = (
554-
F241F52D2D08EE8900C053B5 /* Debug */,
555-
F241F52E2D08EE8900C053B5 /* Release */,
556-
);
557-
defaultConfigurationIsVisible = 0;
558-
defaultConfigurationName = Release;
559-
};
560354
/* End XCConfigurationList section */
561355
};
562356
rootObject = F241F4FA2D08EE8800C053B5 /* Project object */;

‎dev/devicelab/lib/tasks/perf_tests.dart‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1755,13 +1755,20 @@ class CompileTest {
17551755

17561756
Future<TaskResult> runSwiftUIApp() async {
17571757
return inDirectory<TaskResult>(testDirectory, () async {
1758+
final Map<String, String> environment = Platform.environment;
1759+
final String developmentTeam = environment['FLUTTER_XCODE_DEVELOPMENT_TEAM'] ?? 'S8QB4VV633';
1760+
final String? codeSignStyle = environment['FLUTTER_XCODE_CODE_SIGN_STYLE'];
1761+
final String? provisioningProfile =
1762+
environment['FLUTTER_XCODE_PROVISIONING_PROFILE_SPECIFIER'];
1763+
17581764
await Process.run('xcodebuild', <String>['clean', '-allTargets']);
17591765

17601766
int releaseSizeInBytes = 0;
17611767
final Stopwatch watch = Stopwatch();
17621768

17631769
watch.start();
17641770
await Process.run(workingDirectory: testDirectory, 'xcodebuild', <String>[
1771+
'-allowProvisioningUpdates',
17651772
'-scheme',
17661773
'hello_world_swiftui',
17671774
'-target',
@@ -1773,6 +1780,9 @@ class CompileTest {
17731780
'-archivePath',
17741781
'$testDirectory/hello_world_swiftui',
17751782
'archive',
1783+
'DEVELOPMENT_TEAM=$developmentTeam',
1784+
'CODE_SIGN_STYLE=$codeSignStyle',
1785+
'PROVISIONING_PROFILE_SPECIFIER=$provisioningProfile',
17761786
]).then((ProcessResult results) {
17771787
watch.stop();
17781788
print(results.stdout);

0 commit comments

Comments
 (0)