Skip to content

Commit 72f9632

Browse files
committed
Build engine artifacts through github actions
1 parent 142149b commit 72f9632

31 files changed

Lines changed: 7288 additions & 25 deletions

.github/workflows/build-and-upload-engine-artifacts.yml

Lines changed: 6245 additions & 0 deletions
Large diffs are not rendered by default.

.vscode/launch.json

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,28 @@
44
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
55
"version": "0.2.0",
66
"configurations": [
7+
{
8+
"name": "github workflow generator",
9+
"type": "dart",
10+
"request": "launch",
11+
"cwd": "engine/src/",
12+
"program": "flutter/tools/pkg/github_workflow_generator/bin/run.dart",
13+
"args": [
14+
// "-i", "flutter/ci/builders/mac_host_engine.json",
15+
// "-i", "flutter/ci/builders/mac_ios_engine_no_ext_safe.json",
16+
// "-i", "flutter/ci/builders/windows_host_engine.json",
17+
// "-i", "flutter/ci/builders/windows_arm_host_engine.json",
18+
// "-i", "flutter/ci/builders/linux_host_engine.json",
19+
// "-i", "flutter/ci/builders/linux_host_desktop_engine.json",
20+
// "-i", "flutter/ci/builders/linux_arm_host_engine.json",
21+
// "-i", "flutter/ci/builders/windows_android_aot_engine.json",
22+
// "-i", "flutter/ci/builders/mac_android_aot_engine.json",
23+
// "-i", "flutter/ci/builders/linux_android_aot_engine.json",
24+
// "-i", "flutter/ci/builders/linux_android_debug_engine.json",
25+
"-i", "flutter/ci/builders/linux_web_engine_build.json",
26+
"-o", "../../.github/workflows/build-and-upload-engine-artifacts.yml",
27+
]
28+
},
729
{
830
"name": "Hello World (host arm64, debug)",
931
"type": "dart",

DEPS

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -607,7 +607,7 @@ deps = {
607607
'version': Var('clang_version'),
608608
}
609609
],
610-
'condition': 'host_os == "mac"', # On ARM64 Macs too because Goma doesn't support the host-arm64 toolchain.
610+
'condition': 'host_os == "mac" and host_cpu == "x64"',
611611
'dep_type': 'cipd',
612612
},
613613

@@ -629,7 +629,7 @@ deps = {
629629
'version': Var('clang_version'),
630630
}
631631
],
632-
'condition': 'host_os == "linux" or host_os == "mac"',
632+
'condition': 'host_os == "linux" and host_cpu == "x64"',
633633
'dep_type': 'cipd',
634634
},
635635

engine/scripts/slim.gclient

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
# Copy this file to the root of your flutter checkout to bootstrap gclient
2+
# or just run gclient sync in an empty directory with this file.
3+
solutions = [
4+
{
5+
"custom_deps": {},
6+
"deps_file": "DEPS",
7+
"managed": False,
8+
"name": ".",
9+
"safesync_url": "",
10+
11+
# If you are using SSH to connect to GitHub, change the URL to:
12+
# git@github.com:knopp/flutter_zero.git
13+
"url": "https://github.com/knopp/flutter_zero.git",
14+
15+
# Uncomment the custom_vars section below if you plan to build the web engine.
16+
"custom_vars": {
17+
"download_esbuild": False,
18+
"download_android_deps" : False,
19+
"download_jdk": False,
20+
},
21+
},
22+
]

engine/scripts/standard.gclient

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ solutions = [
99
"safesync_url": "",
1010

1111
# If you are using SSH to connect to GitHub, change the URL to:
12-
# git@github.com:flutter/flutter.git
13-
"url": "https://github.com/flutter/flutter.git",
12+
# git@github.com:knopp/flutter_zero.git
13+
"url": "https://github.com/knopp/flutter_zero.git",
1414

1515
# Uncomment the custom_vars section below if you plan to build the web engine.
1616
# "custom_vars": {

engine/scripts/web.gclient

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
# Copy this file to the root of your flutter checkout to bootstrap gclient
2+
# or just run gclient sync in an empty directory with this file.
3+
solutions = [
4+
{
5+
"custom_deps": {},
6+
"deps_file": "DEPS",
7+
"managed": False,
8+
"name": ".",
9+
"safesync_url": "",
10+
11+
# If you are using SSH to connect to GitHub, change the URL to:
12+
# git@github.com:knopp/flutter_zero.git
13+
"url": "https://github.com/knopp/flutter_zero.git",
14+
15+
# Uncomment the custom_vars section below if you plan to build the web engine.
16+
"custom_vars": {
17+
"download_esbuild": True,
18+
"download_android_deps" : False,
19+
"download_jdk": False,
20+
},
21+
},
22+
]

engine/src/build/config/darwin/darwin_sdk.gni

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ declare_args() {
6767
ios_swift_lib_paths = []
6868

6969
# Version of iOS that we're targeting for tests.
70-
ios_testing_deployment_target = "13.0"
70+
ios_testing_deployment_target = "14.5"
7171
}
7272

7373
if (target_os == "ios" || target_os == "macos") {

engine/src/build/toolchain/android/BUILD.gn

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ template("android_toolchain") {
7474
if (host_os == "linux") {
7575
host_dir = "linux-x64"
7676
} else if (host_os == "mac") {
77-
host_dir = "mac-x64"
77+
host_dir = "mac-arm64"
7878
} else {
7979
assert(false, "Unknown host")
8080
}

engine/src/build/toolchain/mac/BUILD.gn

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -461,7 +461,7 @@ if (is_ios) {
461461
is_clang = true
462462

463463
sysroot_rel = rebase_path(ios_sdk_path, root_build_dir)
464-
sysroot_flags = "-isysroot $sysroot_rel -mios-simulator-version-min=$ios_deployment_target"
464+
sysroot_flags = "-isysroot $sysroot_rel"
465465
}
466466

467467
# Toolchain used for iOS simulator targets (x64).
@@ -478,7 +478,7 @@ if (is_ios) {
478478
is_clang = true
479479

480480
sysroot_rel = rebase_path(ios_sdk_path, root_build_dir)
481-
sysroot_flags = "-isysroot $sysroot_rel -mios-simulator-version-min=$ios_deployment_target"
481+
sysroot_flags = "-isysroot $sysroot_rel"
482482
}
483483
}
484484

engine/src/flutter/bin/et

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,9 @@ case "$(uname -m)" in
4040
arm64)
4141
CPU="arm64"
4242
;;
43+
aarch64)
44+
CPU="arm64"
45+
;;
4346
x86_64)
4447
CPU="x64"
4548
;;

0 commit comments

Comments
 (0)