Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Commit 689eb6e

Browse files
authored
reland "Migrate mac_host_engine to engine v2 builds." (#41531)
Relands: #41149 GN+Ninja artifacts have been validated manually. The number of files and their content is the same and presubmit tests are passing correctly in the engine and flutter. The reason of previous reverts are: * FlutterMacOS.framework.zip required to be double zipped. * FlutterMacOS.dSYM.zip required to be double zipped. * GCS cache header needed to be updated during testing. Full details of what has been fixed can be found in: flutter/flutter#124911
1 parent d8e86b5 commit 689eb6e

File tree

2 files changed

+27
-13
lines changed

2 files changed

+27
-13
lines changed

.ci.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -333,6 +333,7 @@ targets:
333333
timeout: 60
334334

335335
- name: Mac Host Engine
336+
bringup: true
336337
recipe: engine/engine
337338
properties:
338339
gclient_variables: >-

ci/builders/mac_host_engine.json

Lines changed: 26 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@
1010
"out/host_debug/zip_archives/darwin-x64/FlutterEmbedder.framework.zip",
1111
"out/host_debug/zip_archives/dart-sdk-darwin-x64.zip"
1212
],
13-
"name": "host_debug"
13+
"name": "host_debug",
14+
"realm": "production"
1415
}
1516
],
1617
"drone_dimensions": [
@@ -66,7 +67,8 @@
6667
"include_paths": [
6768
"out/host_profile/zip_archives/darwin-x64-profile/artifacts.zip"
6869
],
69-
"name": "host_profile"
70+
"name": "host_profile",
71+
"realm": "production"
7072
}
7173
],
7274
"drone_dimensions": [
@@ -120,7 +122,8 @@
120122
"out/host_release/zip_archives/darwin-x64-release/artifacts.zip",
121123
"out/host_release/zip_archives/darwin-x64/font-subset.zip"
122124
],
123-
"name": "host_release"
125+
"name": "host_release",
126+
"realm": "production"
124127
}
125128
],
126129
"drone_dimensions": [
@@ -181,7 +184,8 @@
181184
"out/mac_debug_arm64/zip_archives/darwin-arm64/artifacts.zip",
182185
"out/mac_debug_arm64/zip_archives/dart-sdk-darwin-arm64.zip"
183186
],
184-
"name": "mac_debug_arm64"
187+
"name": "mac_debug_arm64",
188+
"realm": "production"
185189
}
186190
],
187191
"drone_dimensions": [
@@ -221,7 +225,8 @@
221225
"include_paths": [
222226
"out/mac_profile_arm64/zip_archives/darwin-arm64-profile/artifacts.zip"
223227
],
224-
"name": "mac_profile_arm64"
228+
"name": "mac_profile_arm64",
229+
"realm": "production"
225230
}
226231
],
227232
"drone_dimensions": [
@@ -259,7 +264,8 @@
259264
"out/mac_release_arm64/zip_archives/darwin-arm64/font-subset.zip",
260265
"out/mac_release_arm64/zip_archives/darwin-arm64-release/artifacts.zip"
261266
],
262-
"name": "mac_release_arm64"
267+
"name": "mac_release_arm64",
268+
"realm": "production"
263269
}
264270
],
265271
"drone_dimensions": [
@@ -385,31 +391,38 @@
385391
"archives": [
386392
{
387393
"source": "out/release/framework/FlutterMacOS.dSYM.zip",
388-
"destination": "darwin-x64-release/FlutterMacOS.dSYM.zip"
394+
"destination": "darwin-x64-release/FlutterMacOS.dSYM.zip",
395+
"realm": "production"
389396
},
390397
{
391398
"source": "out/debug/framework/FlutterMacOS.framework.zip",
392-
"destination": "darwin-x64/FlutterMacOS.framework.zip"
399+
"destination": "darwin-x64/FlutterMacOS.framework.zip",
400+
"realm": "production"
393401
},
394402
{
395403
"source": "out/profile/framework/FlutterMacOS.framework.zip",
396-
"destination": "darwin-x64-profile/FlutterMacOS.framework.zip"
404+
"destination": "darwin-x64-profile/FlutterMacOS.framework.zip",
405+
"realm": "production"
397406
},
398407
{
399408
"source": "out/release/framework/FlutterMacOS.framework.zip",
400-
"destination": "darwin-x64-release/FlutterMacOS.framework.zip"
409+
"destination": "darwin-x64-release/FlutterMacOS.framework.zip",
410+
"realm": "production"
401411
},
402412
{
403413
"source": "out/debug/snapshot/gen_snapshot.zip",
404-
"destination": "darwin-x64/gen_snapshot.zip"
414+
"destination": "darwin-x64/gen_snapshot.zip",
415+
"realm": "production"
405416
},
406417
{
407418
"source": "out/profile/snapshot/gen_snapshot.zip",
408-
"destination": "darwin-x64-profile/gen_snapshot.zip"
419+
"destination": "darwin-x64-profile/gen_snapshot.zip",
420+
"realm": "production"
409421
},
410422
{
411423
"source": "out/release/snapshot/gen_snapshot.zip",
412-
"destination": "darwin-x64-release/gen_snapshot.zip"
424+
"destination": "darwin-x64-release/gen_snapshot.zip",
425+
"realm": "production"
413426
}
414427
]
415428
}

0 commit comments

Comments
 (0)