From 57c2fac14a3dec35e2c15bea07d0d467043aea93 Mon Sep 17 00:00:00 2001 From: liyuqian Date: Wed, 7 Nov 2018 13:06:38 -0800 Subject: [PATCH] Add engine merge method configuration (#23953) 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. --- bin/internal/README.md | 7 +++++++ bin/internal/engine.merge_method | 1 + 2 files changed, 8 insertions(+) create mode 100644 bin/internal/engine.merge_method diff --git a/bin/internal/README.md b/bin/internal/README.md index da4e94fa8b..c1634b1596 100644 --- a/bin/internal/README.md +++ b/bin/internal/README.md @@ -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 repository. That hash must have successfully been compiled on 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. diff --git a/bin/internal/engine.merge_method b/bin/internal/engine.merge_method new file mode 100644 index 0000000000..97ef86e1d3 --- /dev/null +++ b/bin/internal/engine.merge_method @@ -0,0 +1 @@ +rebase