Merge pull request #5 from flutter/master

Update fork

Author: skia-flutter-autoroll

.cirrus.yml

@@ -1,48 +1,202 @@
 gcp_credentials: ENCRYPTED[987a78af29b91ce8489594c9ab3fec21845bbe5ba68294b8f6def3cf0d380830f06687a89ea69c87344c5ade369700fe]
 
-gke_container:
- image: gcr.io/flutter-cirrus/build-engine-image:latest
- cluster_name: build-32-cluster
- zone: us-central1-a
- namespace: default
- cpu: 30 # can't use all 30-cores; system pods needs cores too
- memory: 100Gb # similarly, can't use all 100Gb memory
+web_shard_template: &WEB_SHARD_TEMPLATE
+  only_if: "changesInclude('.cirrus.yml', 'lib/web_ui/**', 'web_sdk/**') || $CIRRUS_PR == ''"
+  environment:
+    # As of October 2019, the Web shards needed more than 6G of RAM.
+    CPU: 2
+    MEMORY: 8G
+  compile_host_script: |
+    cd $ENGINE_PATH/src
+    ./flutter/tools/gn --unoptimized --full-dart-sdk
+    ninja -C out/host_debug_unopt
+  fetch_framework_script: |
+    cd $ENGINE_PATH/src/flutter/tools
+    ./clone_flutter.sh
+    cd $FRAMEWORK_PATH/flutter
+    bin/flutter update-packages --local-engine=host_debug_unopt
+  script:
+    - dart --enable-asserts $FRAMEWORK_PATH/flutter/dev/bots/test.dart --local-engine=host_debug_unopt
 
+# LINUX
 task:
+  gke_container:
+    dockerfile: "ci/docker/build/Dockerfile"
+    builder_image_name: docker-builder # gce vm image
+    cluster_name: build-32-cluster
+    zone: us-central1-a
+    namespace: default
+    cpu: 30 # can't use all 30-cores; system pods needs cores too
+    memory: 100Gb # similarly, can't use all 100Gb memory
   env:
+    CIRRUS_DOCKER_CONTEXT: "ci/docker/build"
     CIRRUS_WORKING_DIR: "/tmp/github_repo"
-
-  replace_engine_script: |
+    ENGINE_PATH: "/tmp/clean_engine"
+    DEPOT_TOOLS: "/tmp/depot_tools"
+    FLUTTER_ENGINE: "/tmp/clean_engine/src"
+    FRAMEWORK_PATH: "/tmp/master_framework"
+    PATH: "$FLUTTER_ENGINE/third_party/dart/tools/sdks/dart-sdk/bin:$DEPOT_TOOLS:$PATH"
+    USE_ANDROID: "False"
+    # TODO(liyuqian): currently we're using flutter-cirrus GCP project. Migrate
+    # to flutter-infra project once the metrics_center service is stabilized,
+    BENCHMARK_GCP_CREDENTIALS: ENCRYPTED[da76d2b7b39894de70fae1fc9182c97cc41400adc93f0f1c49bc7442f15fb933da8d756ed88523810a9a77c34f51a693]
+  setup_script: |
+    git clone --depth 1 https://chromium.googlesource.com/chromium/tools/depot_tools.git $DEPOT_TOOLS
+    mkdir -p $ENGINE_PATH/src
+    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
     cd $ENGINE_PATH/src
-    rm -r flutter
+    rm -rf flutter
+    rm -rf out
     mv $CIRRUS_WORKING_DIR flutter
     gclient sync
-
   matrix:
-    - name: build_and_test_host
+    - name: build_and_benchmark_linux_release
+      only_if: $CIRRUS_BRANCH == 'master' # Only run for post-submit commits.
+      compile_host_script: |
+        cd $ENGINE_PATH/src
+        ./flutter/tools/gn --runtime-mode=release
+        ninja -C out/host_release
+      benchmark_host_script: |
+        cd $ENGINE_PATH/src/out/host_release/
+        ./txt_benchmarks --benchmark_format=json > txt_benchmarks.json
+        cd $ENGINE_PATH/src/flutter/testing/benchmark
+        pub get
+        dart bin/parse_and_send.dart ../../../out/host_release/txt_benchmarks.json
+    - name: build_and_test_linux_unopt_debug
       compile_host_script: |
         cd $ENGINE_PATH/src
-        ./flutter/tools/gn --unoptimized
+        ./flutter/tools/gn --unoptimized --full-dart-sdk
         ninja -C out/host_debug_unopt
-      test_host_script: cd $ENGINE_PATH/src && ./flutter/testing/run_tests.sh
-    - name: build_android
+      test_host_script: |
+        cd $ENGINE_PATH/src
+        ./flutter/testing/run_tests.sh host_debug_unopt
+      test_web_engine_script: |
+        cd $ENGINE_PATH/src/flutter/web_sdk/web_engine_tester
+        $ENGINE_PATH/src/out/host_debug_unopt/dart-sdk/bin/pub get
+        cd $ENGINE_PATH/src/flutter/lib/web_ui
+        $ENGINE_PATH/src/out/host_debug_unopt/dart-sdk/bin/pub get
+        export FELT="$ENGINE_PATH/src/out/host_debug_unopt/dart-sdk/bin/dart dev/felt.dart"
+        $FELT check-licenses
+        CHROME_NO_SANDBOX=true $FELT test
+      always:
+        web_engine_test_artifacts:
+          path: test_results/*
+      fetch_framework_script: |
+        mkdir -p $FRAMEWORK_PATH
+        cd $FRAMEWORK_PATH
+        git clone https://github.com/flutter/flutter.git
+      test_web_script: |
+        cd $FRAMEWORK_PATH/flutter/dev/integration_tests/web
+        ../../../bin/flutter config --local-engine=host_debug_unopt --no-analytics --enable-web
+        ../../../bin/flutter --local-engine=host_debug_unopt build web -v
+      analyze_framework_script: |
+        cd $FRAMEWORK_PATH/flutter
+        rm -rf bin/cache/pkg/sky_engine
+        cp -r $ENGINE_PATH/src/out/host_debug_unopt/gen/dart-pkg/sky_engine bin/cache/pkg/
+        bin/flutter update-packages --local-engine=host_debug_unopt
+        bin/flutter analyze --dartdocs --flutter-repo --local-engine=host_debug_unopt
+      test_framework_script: |
+        cd $FRAMEWORK_PATH/flutter/packages/flutter
+        ../../bin/flutter test --local-engine=host_debug_unopt
+
+    # PLEASE KEEP THESE WEB TEST SHARDS IN SYNC WITH THEIR COUNTERPARTS IN flutter/flutter's CIRRUS CONFIG.
+    - name: web_tests-0-linux
+      << : *WEB_SHARD_TEMPLATE
+
+    - name: web_tests-1-linux
+      << : *WEB_SHARD_TEMPLATE
+
+    - name: web_tests-2-linux
+      << : *WEB_SHARD_TEMPLATE
+
+    - name: web_tests-3-linux
+      << : *WEB_SHARD_TEMPLATE
+
+    - name: web_tests-4-linux
+      << : *WEB_SHARD_TEMPLATE
+
+    - name: web_tests-5-linux
+      << : *WEB_SHARD_TEMPLATE
+
+    - name: web_tests-6-linux
+      << : *WEB_SHARD_TEMPLATE
+
+    - name: web_tests-7_last-linux # last Web shard must end with _last
+      << : *WEB_SHARD_TEMPLATE
+
+    - name: build_and_test_web_linux_firefox
+      compile_host_script: |
+        cd $ENGINE_PATH/src
+        ./flutter/tools/gn --unoptimized --full-dart-sdk
+        ninja -C out/host_debug_unopt
+      test_web_engine_firefox_script: |
+        cd $ENGINE_PATH/src/flutter/web_sdk/web_engine_tester
+        $ENGINE_PATH/src/out/host_debug_unopt/dart-sdk/bin/pub get
+        cd $ENGINE_PATH/src/flutter/lib/web_ui
+        $ENGINE_PATH/src/out/host_debug_unopt/dart-sdk/bin/pub get
+        export FELT="$ENGINE_PATH/src/out/host_debug_unopt/dart-sdk/bin/dart dev/felt.dart"
+        $FELT test --browser=firefox
+    - name: build_and_test_android_unopt_debug
+      env:
+        USE_ANDROID: "True"
+        ANDROID_HOME: $ENGINE_PATH/src/third_party/android_tools/sdk
+      lint_host_script: |
+        cd $ENGINE_PATH/src/flutter/tools/android_lint
+        $ENGINE_PATH/src/third_party/dart/tools/sdks/dart-sdk/bin/pub get
+        $ENGINE_PATH/src/third_party/dart/tools/sdks/dart-sdk/bin/dart bin/main.dart
       compile_host_script: |
         cd $ENGINE_PATH/src
         ./flutter/tools/gn --android --unoptimized
         ninja -C out/android_debug_unopt
+        mkdir javadoc_tmp
+        ./flutter/tools/gen_javadoc.py --out-dir javadoc_tmp
+      test_android_script: cd $ENGINE_PATH/src && python ./flutter/testing/run_tests.py --type=java
+    - name: format_and_dart_test
+      format_script: |
+        cd $ENGINE_PATH/src/flutter
+        ./ci/format.sh
+      build_script: |
+        cd $ENGINE_PATH/src/flutter
+        ./ci/build.sh
+    - name: build_fuchsia_artifacts
+      compile_fuchsia_script: |
+        cd $ENGINE_PATH/src
+        ./flutter/tools/fuchsia/build_fuchsia_artifacts.py --engine-version HEAD --runtime-mode debug --no-lto --archs x64
+        cd $ENGINE_PATH/src/flutter
 
-format_and_dart_test_task:
-  container:
-    image: gcr.io/flutter-cirrus/build-engine-image:latest
-
+# WINDOWS
+task:
+  gce_instance:
+    image_project: flutter-cirrus
+    image_name: flutter-engine-windows-server-2016
+    zone: us-central1-a
+    platform: windows
+    cpu: 32
+    memory: 32Gb
+    disk: 50
   env:
-    CIRRUS_WORKING_DIR: "/tmp/github_repo"
-
-  replace_engine_script: |
-    cd $ENGINE_PATH/src
-    rm -r flutter
-    cp $CIRRUS_WORKING_DIR -r ./flutter
+    # Cirrus is somehow not picking up the environment variables set in the VM image.
+    PATH: "c:/depot_tools;c:/MinGit/cmd;$PATH"
+    DEPOT_TOOLS_WIN_TOOLCHAIN: 0
+    GYP_MSVS_OVERRIDE_PATH: "c:/Program Files (x86)/Microsoft Visual Studio/2017/Community"
+    ENGINE_PATH: "c:/flutter/engine"
+  setup_script: |
+    REM robocopy can return 1 for successful copy; suppress its error code.
+    REM move somehow doesn't work as it complains that the file is being used by another process.
+    robocopy %CIRRUS_WORKING_DIR% %ENGINE_PATH%/src/flutter /MIR| (cmd /s /c exit /b 0)
+    cd %ENGINE_PATH%/src
     gclient sync
-
-  format_script: cd $ENGINE_PATH/src/flutter && ./ci/format.sh
-  build_script: cd $ENGINE_PATH/src/flutter && ./ci/build.sh
+  matrix:
+    - name: build_and_test_windows_unopt_debug
+      compile_host_script: |
+        cd %ENGINE_PATH%/src
+        python flutter/tools/gn --runtime-mode debug --unoptimized
+        ninja -C out/host_debug_unopt
+      test_host_script: |
+        cd %ENGINE_PATH%/src
+        python flutter/testing/run_tests.py --type=engine
+    - name: build_windows_opt_debug
+      compile_host_script: |
+        cd %ENGINE_PATH%/src
+        python flutter/tools/gn --runtime-mode debug
+        ninja -C out/host_debug

.github/auto_assign.yml

@@ -0,0 +1,41 @@
+# This is the config file for `auto-assign` bot.
+# https://github.com/kentaro-m/auto-assign/
+
+# Set to true to add reviewers to pull requests
+addReviewers: true
+
+# Set to true to add assignees to pull requests
+addAssignees: false
+
+# A list of reviewers to be added to pull requests (GitHub user name)
+# Note: Add new engine contributors here when joining the team.
+reviewers:
+  - gaaclarke
+  - liyuqian
+  - gw280
+  - chinmaygarde
+  - GaryQian
+  - jason-simmons
+  - iskakaushik
+  - franciscojma86
+  - cbracken
+  - flar
+  - stuartmorgan
+
+# A number of reviewers added to the pull request
+# Set 0 to add all the reviewers (default: 0)
+numberOfReviewers: 1
+
+# A list of assignees, overrides reviewers if set
+# assignees:
+#   - assigneeA
+
+# A number of assignees to add to the pull request
+# Set to 0 to add all of the assignees.
+# Uses numberOfReviewers if unset.
+# numberOfAssignees: 2
+
+# A list of keywords to be skipped the process that add reviewers if pull requests include it
+skipKeywords:
+  - Roll
+  - web

.gitignore

@@ -3,7 +3,9 @@
 *~
 .*.sw?
 .DS_Store
+.ccls-cache
 .classpath
+.clangd/
 .cproject
 .dart_tool
 .gdb_history
@@ -14,10 +16,16 @@
 .project
 .pub
 .pydevproject
+compile_commands.json
 cscope.*
 Session.vim
 tags
 Thumbs.db
 .idea
 pubspec.lock
 .vscode/
+docs/doxygen/
+xcuserdata
+
+third_party/gn/
+

AUTHORS

@@ -14,3 +14,5 @@ Victor Choueiri <[email protected]>
 Simon Lightfoot <[email protected]>
 Dwayne Slater <[email protected]>
 Tetsuhiro Ueda <[email protected]>
+shoryukenn <[email protected]>
+SOTEC GmbH & Co. KG <[email protected]>