zan1456/flutter
1
0
Fork 0
forked from firka/flutter
Code Pull Requests Activity

Add engine merge method configuration (#23953)

Browse Source 
In order for this to take effect, https://skia-review.googlesource.com/c/buildbot/+/167200
needs to be landed and deployed.

The /bin/internal/engine.merge_method file controls how we merge a pull
request created by the engine auto-roller. If it's squash, there's only one
commit for a pull request no matter how many engine commits there are inside
that pull request. If it's rebase, the number of commits in the framework is
equal to the number of engine commits in the pull request. The latter method is
easier to detect regressions but cost more test resources.
This commit is contained in:
liyuqian
2018-11-07 13:06:38 -08:00
committed by GitHub
parent 50fb729609
commit 57c2fac14a
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
bin/internal/README.md
View File

@@ -4,3 +4,10 @@ Dart SDK dependency
The `bin/internal/engine.version` file controls which version of the Flutter engine to use.
The file contains the commit hash of a commit in the <https://github.com/flutter/engine> repository.
That hash must have successfully been compiled on <https://build.chromium.org/p/client.flutter/> and had its artifacts (the binaries that run on Android and iOS, the compiler, etc) successfully uploaded to Google Cloud Storage.
The `/bin/internal/engine.merge_method` file controls how we merge a pull
request created by the engine auto-roller. If it's `squash`, there's only one
commit for a pull request no matter how many engine commits there are inside
that pull request. If it's `rebase`, the number of commits in the framework is
equal to the number of engine commits in the pull request. The latter method
makes it easier to detect regressions but costs more test resources.

1
bin/internal/engine.merge_method Normal file
View File

@@ -0,0 +1 @@
rebase