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

[ios] upload extension safe artifacts #45664

Merged
auto-submit merged 2 commits into from
Sep 12, 2023
Merged

[ios] upload extension safe artifacts #45664

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5e3d3c0
upload extension safe artifacts
Sep 11, 2023
dcea548
move arm jobs to arm machines
Sep 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
189 changes: 189 additions & 0 deletions ci/builders/mac_ios_engine.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,128 @@
"sdk_version": "14e300c"
}
}
},
{
"drone_dimensions": [
"device_type=none",
"mac_model=Macmini8,1",
Copy link
Contributor

@godofredoc godofredoc Sep 11, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do they have to run on x64 machines? if not I'd recommend to remove this line here and below.

Copy link
Contributor Author

@cyanglaz cyanglaz Sep 12, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I copied this from other above jobs. I thought the jobs for arm64 builds can be run on arm machines, but the ones without arm64 (like this one) should not.
I can fix the existing ones in a separate PR then fix this too.

Copy link
Contributor Author

@cyanglaz cyanglaz Sep 12, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Move all the jobs to arm machines except the x86 simulator

"os=Mac-12"
],
"gn": [
"--ios",
"--runtime-mode",
"debug",
"--simulator",
"--no-lto",
"--darwin-extension-safe"
],
"name": "ios_debug_sim_extension_safe",
"ninja": {
"config": "ios_debug_sim_extension_safe"
},
"properties": {
"$flutter/osx_sdk": {
"sdk_version": "14e300c"
}
}
},
{
"drone_dimensions": [
"device_type=none",
"os=Mac-12"
],
"gn": [
"--ios",
"--runtime-mode",
"debug",
"--simulator",
"--simulator-cpu=arm64",
"--no-lto",
"--darwin-extension-safe"
],
"name": "ios_debug_sim_arm64_extension_safe",
"ninja": {
"config": "ios_debug_sim_arm64_extension_safe"
},
"properties": {
"$flutter/osx_sdk": {
"sdk_version": "14e300c"
}
}
},
{
"drone_dimensions": [
"device_type=none",
"os=Mac-12"
],
"gn": [
"--ios",
"--runtime-mode",
"debug",
"--darwin-extension-safe"
],
"name": "ios_debug_extension_safe",
"ninja": {
"config": "ios_debug_extension_safe",
"targets": [
"flutter/shell/platform/darwin/ios:flutter_framework"
]
},
"properties": {
"$flutter/osx_sdk": {
"sdk_version": "14e300c"
}
}
},
{
"drone_dimensions": [
"device_type=none",
"os=Mac-12"
],
"gn": [
"--ios",
"--runtime-mode",
"profile",
"--darwin-extension-safe"
],
"name": "ios_profile_extension_safe",
"ninja": {
"config": "ios_profile_extension_safe",
"targets": [
"flutter/shell/platform/darwin/ios:flutter_framework",
"flutter/lib/snapshot:generate_snapshot_bin"
]
},
"properties": {
"$flutter/osx_sdk": {
"sdk_version": "14e300c"
}
}
},
{
"drone_dimensions": [
"device_type=none",
"os=Mac-12"
],
"gn": [
"--ios",
"--runtime-mode",
"release",
"--darwin-extension-safe"
],
"name": "ios_release_extension_safe",
"ninja": {
"config": "ios_release_extension_safe",
"targets": [
"flutter/shell/platform/darwin/ios:flutter_framework",
"flutter/lib/snapshot:generate_snapshot_bin"
]
},
"properties": {
"$flutter/osx_sdk": {
"sdk_version": "14e300c"
}
}
}
],
"generators": {
Expand Down Expand Up @@ -167,6 +289,53 @@
"script": "flutter/sky/tools/create_full_ios_framework.py",
"language": "python3"
},
{
"name": "Debug-ios-Flutter-Extension-Safe.xcframework",
"parameters": [
"--dst",
"out/debug_extension_safe",
"--arm64-out-dir",
"out/ios_debug_extension_safe",
"--simulator-x64-out-dir",
"out/ios_debug_sim_extension_safe",
"--simulator-arm64-out-dir",
"out/ios_debug_sim_arm64_extension_safe"
],
"script": "flutter/sky/tools/create_full_ios_framework.py",
"language": "python3"
},
{
"name": "Profile-ios-Flutter-Extension-Safe.xcframework",
"parameters": [
"--dst",
"out/profile_extension_safe",
"--arm64-out-dir",
"out/ios_profile_extension_safe",
"--simulator-x64-out-dir",
"out/ios_debug_sim_extension_safe",
"--simulator-arm64-out-dir",
"out/ios_debug_sim_arm64_extension_safe"
],
"script": "flutter/sky/tools/create_full_ios_framework.py",
"language": "python3"
},
{
"name": "Release-ios-Flutter-Extension-Safe.xcframework",
"parameters": [
"--dst",
"out/release_extension_safe",
"--arm64-out-dir",
"out/ios_release_extension_safe",
"--simulator-x64-out-dir",
"out/ios_debug_sim_extension_safe",
"--simulator-arm64-out-dir",
"out/ios_debug_sim_arm64_extension_safe",
"--dsym",
"--strip"
],
"script": "flutter/sky/tools/create_full_ios_framework.py",
"language": "python3"
},
{
"name": "Release-macos-gen-snapshots",
"parameters": [
Expand Down Expand Up @@ -208,6 +377,26 @@
"source": "out/release/Flutter.dSYM.zip",
"destination": "ios-release/Flutter.dSYM.zip",
"realm": "production"
},
{
"source": "out/debug_extension_safe/artifacts.zip",
"destination": "ios-extension-safe/artifacts.zip",
"realm": "production"
},
{
"source": "out/profile_extension_safe/artifacts.zip",
"destination": "ios-profile-extension-safe/artifacts.zip",
"realm": "production"
},
{
"source": "out/release_extension_safe/artifacts.zip",
"destination": "ios-release-extension-safe/artifacts.zip",
"realm": "production"
},
{
"source": "out/release_extension_safe/Flutter.dSYM.zip",
"destination": "ios-release-extension-safe/Flutter.dSYM.zip",
"realm": "production"
}
]
}
2 changes: 2 additions & 0 deletions tools/gn_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,9 @@ def test_get_out_dir(self):
self._expect_build_dir(['--debug'], 'out/Debug')
self._expect_build_dir(['--release'], 'out/Release')
self._expect_build_dir(['--ios'], 'out/ios_Debug')
self._expect_build_dir(['--ios'], 'out/ios_Debug_extension_safe')
self._expect_build_dir(['--ios', '--release'], 'out/ios_Release')
self._expect_build_dir(['--ios'], 'out/ios_Release_extension_safe')
self._expect_build_dir(['--android'], 'out/android_Debug')
self._expect_build_dir(['--android', '--release'], 'out/android_Release')

Expand Down