Skip to content

Commit 346ee7f

Browse files
Merge pull request #3 from flutter/master
Update fork master branch
2 parents fbce2bf + d6b75b7 commit 346ee7f

File tree

1,841 files changed

+230568
-29464
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,841 files changed

+230568
-29464
lines changed

.cirrus.yml

Lines changed: 139 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,158 @@
11
gcp_credentials: ENCRYPTED[987a78af29b91ce8489594c9ab3fec21845bbe5ba68294b8f6def3cf0d380830f06687a89ea69c87344c5ade369700fe]
22

3-
gke_container:
4-
image: gcr.io/flutter-cirrus/build-engine-image:latest
5-
cluster_name: build-32-cluster
6-
zone: us-central1-a
7-
namespace: default
8-
cpu: 30 # can't use all 30-cores; system pods needs cores too
9-
memory: 100Gb # similarly, can't use all 100Gb memory
10-
3+
# LINUX
114
task:
5+
gke_container:
6+
dockerfile: "ci/docker/build/Dockerfile"
7+
builder_image_name: docker-builder # gce vm image
8+
cluster_name: build-32-cluster
9+
zone: us-central1-a
10+
namespace: default
11+
cpu: 30 # can't use all 30-cores; system pods needs cores too
12+
memory: 100Gb # similarly, can't use all 100Gb memory
1213
env:
14+
CIRRUS_DOCKER_CONTEXT: "ci/docker/build"
1315
CIRRUS_WORKING_DIR: "/tmp/github_repo"
14-
15-
replace_engine_script: |
16+
ENGINE_PATH: "/tmp/clean_engine"
17+
DEPOT_TOOLS: "/tmp/depot_tools"
18+
FLUTTER_ENGINE: "/tmp/clean_engine/src"
19+
FRAMEWORK_PATH: "/tmp/master_framework"
20+
PATH: "$FLUTTER_ENGINE/third_party/dart/tools/sdks/dart-sdk/bin:$DEPOT_TOOLS:$PATH"
21+
USE_ANDROID: "False"
22+
# TODO(liyuqian): currently we're using flutter-cirrus GCP project. Migrate
23+
# to flutter-infra project once the metrics_center service is stabilized,
24+
BENCHMARK_GCP_CREDENTIALS: ENCRYPTED[da76d2b7b39894de70fae1fc9182c97cc41400adc93f0f1c49bc7442f15fb933da8d756ed88523810a9a77c34f51a693]
25+
setup_script: |
26+
git clone --depth 1 https://chromium.googlesource.com/chromium/tools/depot_tools.git $DEPOT_TOOLS
27+
mkdir -p $ENGINE_PATH/src
28+
echo 'solutions = [{"managed": False,"name": "src/flutter","url": "[email protected]:flutter/engine.git","deps_file": "DEPS", "custom_vars": {"download_android_deps" : ' $USE_ANDROID ', "download_windows_deps" : False,},},]' > $ENGINE_PATH/.gclient
1629
cd $ENGINE_PATH/src
17-
rm -r flutter
30+
rm -rf flutter
31+
rm -rf out
1832
mv $CIRRUS_WORKING_DIR flutter
1933
gclient sync
20-
2134
matrix:
22-
- name: build_and_test_host
35+
- name: build_and_benchmark_linux_release
36+
only_if: $CIRRUS_BRANCH == 'master' # Only run for post-submit commits.
37+
compile_host_script: |
38+
cd $ENGINE_PATH/src
39+
./flutter/tools/gn --runtime-mode=release
40+
ninja -C out/host_release
41+
benchmark_host_script: |
42+
cd $ENGINE_PATH/src/out/host_release/
43+
./txt_benchmarks --benchmark_format=json > txt_benchmarks.json
44+
cd $ENGINE_PATH/src/flutter/testing/benchmark
45+
pub get
46+
dart bin/parse_and_send.dart ../../../out/host_release/txt_benchmarks.json
47+
- name: build_and_test_linux_unopt_debug
2348
compile_host_script: |
2449
cd $ENGINE_PATH/src
25-
./flutter/tools/gn --unoptimized
50+
./flutter/tools/gn --unoptimized --full-dart-sdk
2651
ninja -C out/host_debug_unopt
27-
test_host_script: cd $ENGINE_PATH/src && ./flutter/testing/run_tests.sh
28-
- name: build_android
52+
test_host_script: |
53+
cd $ENGINE_PATH/src
54+
./flutter/testing/run_tests.sh host_debug_unopt
55+
test_web_engine_script: |
56+
cd $ENGINE_PATH/src/flutter/web_sdk/web_engine_tester
57+
$ENGINE_PATH/src/out/host_debug_unopt/dart-sdk/bin/pub get
58+
cd $ENGINE_PATH/src/flutter/lib/web_ui
59+
$ENGINE_PATH/src/out/host_debug_unopt/dart-sdk/bin/pub get
60+
export FELT="$ENGINE_PATH/src/out/host_debug_unopt/dart-sdk/bin/dart dev/felt.dart"
61+
$FELT check-licenses
62+
CHROME_NO_SANDBOX=true $FELT test
63+
always:
64+
web_engine_test_artifacts:
65+
path: test_results/*
66+
fetch_framework_script: |
67+
mkdir -p $FRAMEWORK_PATH
68+
cd $FRAMEWORK_PATH
69+
git clone https://github.com/flutter/flutter.git
70+
test_web_script: |
71+
cd $FRAMEWORK_PATH/flutter/dev/integration_tests/web
72+
../../../bin/flutter config --local-engine=host_debug_unopt --no-analytics --enable-web
73+
../../../bin/flutter --local-engine=host_debug_unopt build web -v
74+
analyze_framework_script: |
75+
cd $FRAMEWORK_PATH/flutter
76+
rm -rf bin/cache/pkg/sky_engine
77+
cp -r $ENGINE_PATH/src/out/host_debug_unopt/gen/dart-pkg/sky_engine bin/cache/pkg/
78+
bin/flutter update-packages --local-engine=host_debug_unopt
79+
bin/flutter analyze --dartdocs --flutter-repo --local-engine=host_debug_unopt
80+
test_framework_script: |
81+
cd $FRAMEWORK_PATH/flutter/packages/flutter
82+
../../bin/flutter test --local-engine=host_debug_unopt
83+
- name: build_and_test_web_linux_firefox
84+
compile_host_script: |
85+
cd $ENGINE_PATH/src
86+
./flutter/tools/gn --unoptimized --full-dart-sdk
87+
ninja -C out/host_debug_unopt
88+
test_web_engine_firefox_script: |
89+
cd $ENGINE_PATH/src/flutter/web_sdk/web_engine_tester
90+
$ENGINE_PATH/src/out/host_debug_unopt/dart-sdk/bin/pub get
91+
cd $ENGINE_PATH/src/flutter/lib/web_ui
92+
$ENGINE_PATH/src/out/host_debug_unopt/dart-sdk/bin/pub get
93+
export FELT="$ENGINE_PATH/src/out/host_debug_unopt/dart-sdk/bin/dart dev/felt.dart"
94+
$FELT test --browser=firefox
95+
- name: build_and_test_android_unopt_debug
96+
env:
97+
USE_ANDROID: "True"
98+
ANDROID_HOME: $ENGINE_PATH/src/third_party/android_tools/sdk
99+
lint_host_script: |
100+
cd $ENGINE_PATH/src/flutter/tools/android_lint
101+
$ENGINE_PATH/src/third_party/dart/tools/sdks/dart-sdk/bin/pub get
102+
$ENGINE_PATH/src/third_party/dart/tools/sdks/dart-sdk/bin/dart bin/main.dart
29103
compile_host_script: |
30104
cd $ENGINE_PATH/src
31105
./flutter/tools/gn --android --unoptimized
32106
ninja -C out/android_debug_unopt
107+
mkdir javadoc_tmp
108+
./flutter/tools/gen_javadoc.py --out-dir javadoc_tmp
109+
test_android_script: cd $ENGINE_PATH/src && python ./flutter/testing/run_tests.py --type=java
110+
- name: format_and_dart_test
111+
format_script: |
112+
cd $ENGINE_PATH/src/flutter
113+
./ci/format.sh
114+
build_script: |
115+
cd $ENGINE_PATH/src/flutter
116+
./ci/build.sh
117+
- name: build_fuchsia_artifacts
118+
compile_fuchsia_script: |
119+
cd $ENGINE_PATH/src
120+
./flutter/tools/fuchsia/build_fuchsia_artifacts.py --engine-version HEAD --runtime-mode debug --no-lto --archs x64
121+
cd $ENGINE_PATH/src/flutter
33122
34-
format_and_dart_test_task:
35-
container:
36-
image: gcr.io/flutter-cirrus/build-engine-image:latest
37-
123+
# WINDOWS
124+
task:
125+
gce_instance:
126+
image_project: flutter-cirrus
127+
image_name: flutter-engine-windows-server-2016
128+
zone: us-central1-a
129+
platform: windows
130+
cpu: 32
131+
memory: 32Gb
132+
disk: 50
38133
env:
39-
CIRRUS_WORKING_DIR: "/tmp/github_repo"
40-
41-
replace_engine_script: |
42-
cd $ENGINE_PATH/src
43-
rm -r flutter
44-
cp $CIRRUS_WORKING_DIR -r ./flutter
134+
# Cirrus is somehow not picking up the environment variables set in the VM image.
135+
PATH: "c:/depot_tools;c:/MinGit/cmd;$PATH"
136+
DEPOT_TOOLS_WIN_TOOLCHAIN: 0
137+
GYP_MSVS_OVERRIDE_PATH: "c:/Program Files (x86)/Microsoft Visual Studio/2017/Community"
138+
ENGINE_PATH: "c:/flutter/engine"
139+
setup_script: |
140+
REM robocopy can return 1 for successful copy; suppress its error code.
141+
REM move somehow doesn't work as it complains that the file is being used by another process.
142+
robocopy %CIRRUS_WORKING_DIR% %ENGINE_PATH%/src/flutter /MIR| (cmd /s /c exit /b 0)
143+
cd %ENGINE_PATH%/src
45144
gclient sync
46-
47-
format_script: cd $ENGINE_PATH/src/flutter && ./ci/format.sh
48-
build_script: cd $ENGINE_PATH/src/flutter && ./ci/build.sh
145+
matrix:
146+
- name: build_and_test_windows_unopt_debug
147+
compile_host_script: |
148+
cd %ENGINE_PATH%/src
149+
python flutter/tools/gn --runtime-mode debug --unoptimized
150+
ninja -C out/host_debug_unopt
151+
test_host_script: |
152+
cd %ENGINE_PATH%/src
153+
python flutter/testing/run_tests.py --type=engine
154+
- name: build_windows_opt_debug
155+
compile_host_script: |
156+
cd %ENGINE_PATH%/src
157+
python flutter/tools/gn --runtime-mode debug
158+
ninja -C out/host_debug

.github/auto_assign.yml

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
# This is the config file for `auto-assign` bot.
2+
# https://github.com/kentaro-m/auto-assign/
3+
4+
# Set to true to add reviewers to pull requests
5+
addReviewers: true
6+
7+
# Set to true to add assignees to pull requests
8+
addAssignees: false
9+
10+
# A list of reviewers to be added to pull requests (GitHub user name)
11+
# Note: Add new engine contributors here when joining the team.
12+
reviewers:
13+
- gaaclarke
14+
- liyuqian
15+
- gw280
16+
- chinmaygarde
17+
- GaryQian
18+
- jason-simmons
19+
- iskakaushik
20+
- franciscojma86
21+
- cbracken
22+
- flar
23+
- stuartmorgan
24+
25+
# A number of reviewers added to the pull request
26+
# Set 0 to add all the reviewers (default: 0)
27+
numberOfReviewers: 1
28+
29+
# A list of assignees, overrides reviewers if set
30+
# assignees:
31+
# - assigneeA
32+
33+
# A number of assignees to add to the pull request
34+
# Set to 0 to add all of the assignees.
35+
# Uses numberOfReviewers if unset.
36+
# numberOfAssignees: 2
37+
38+
# A list of keywords to be skipped the process that add reviewers if pull requests include it
39+
skipKeywords:
40+
- Roll
41+
- web

.gitignore

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@
33
*~
44
.*.sw?
55
.DS_Store
6+
.ccls-cache
67
.classpath
8+
.clangd/
79
.cproject
810
.dart_tool
911
.gdb_history
@@ -14,10 +16,16 @@
1416
.project
1517
.pub
1618
.pydevproject
19+
compile_commands.json
1720
cscope.*
1821
Session.vim
1922
tags
2023
Thumbs.db
2124
.idea
2225
pubspec.lock
2326
.vscode/
27+
docs/doxygen/
28+
xcuserdata
29+
30+
third_party/gn/
31+

AUTHORS

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,5 @@ Victor Choueiri <[email protected]>
1414
Simon Lightfoot <[email protected]>
1515
Dwayne Slater <[email protected]>
1616
Tetsuhiro Ueda <[email protected]>
17+
shoryukenn <[email protected]>
18+
SOTEC GmbH & Co. KG <[email protected]>

0 commit comments

Comments
 (0)