Commit Graph

12 Commits

Author SHA1 Message Date
Vyacheslav Egorov 00ed6b21fb [gardening] Update 3xHEAD apply script.
It is currently failing because it is trying to cd in non-existent directory.

Change-Id: I29f3947db6aa0e34d747309b310da565dc0c010d
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/103137
Reviewed-by: Vyacheslav Egorov <vegorov@google.com>
Commit-Queue: Vyacheslav Egorov <vegorov@google.com>
Auto-Submit: Vyacheslav Egorov <vegorov@google.com>
2019-05-21 14:35:32 +00:00
Alexander Thomas e2b5559c77 [infra] Use gclient.py to apply patches to bypass update_depot_tools
apply.sh calls gclient, but the default gclient script always runs
update_depot_tools but that is not available on bots. Calling
gclient.py directly avoids that.

Change-Id: Ief80b4822277aa5a0d075c324eed0ef15a81359d
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/96682
Reviewed-by: Alexander Aprelev <aam@google.com>
2019-03-12 18:18:14 +00:00
Martin Kustermann 1bfc3816d8 [infra] Extend 3head patching to apply patches for flutter/flutter depending on pinned engine commit
This also adds a patch to flutter/flutter to fix head-head-head
configuration (until engine is rolled into framework again).

Change-Id: I6dae0983126a6664337834d3c93f1369139f1ac1
Reviewed-on: https://dart-review.googlesource.com/c/91922
Commit-Queue: Martin Kustermann <kustermann@google.com>
Reviewed-by: Jonas Termansen <sortie@google.com>
2019-02-04 12:37:10 +00:00
Vyacheslav Egorov 1891636db0 [gardening] Final attempt to fix apply.sh.
Use git cache fetch correctly

TBR=kustermann@google.com

Change-Id: I9245ebc2bb36e4f80e815b0f4557a34f77cbbe84
Reviewed-on: https://dart-review.googlesource.com/c/85289
Reviewed-by: Vyacheslav Egorov <vegorov@google.com>
2018-11-23 15:32:40 +00:00
Vyacheslav Egorov 6300b7e0a0 [gardening] Fix apply.sh syntax (no spaces between variable name and =)
TBR=kustermann@google.com

Change-Id: Ia268f69045d91447f5b84ee9a21926b03ecc2f58
Reviewed-on: https://dart-review.googlesource.com/c/85288
Reviewed-by: Vyacheslav Egorov <vegorov@google.com>
2018-11-23 15:19:21 +00:00
Vyacheslav Egorov 2fbc6b9a2e [gardening] Make apply.sh script force update git cache used by bots
R=kustermann@google.com

Change-Id: Id03377dbe4a294032d41a612076b933b447fd2f6
Reviewed-on: https://dart-review.googlesource.com/c/85287
Reviewed-by: Martin Kustermann <kustermann@google.com>
2018-11-23 15:03:57 +00:00
Vyacheslav Egorov 1ed5f78e9c [gardening] Make apply.sh script fetch before trying to checkout.
TBR=kustermann@google.com

Change-Id: I195100218b7d83eee4647d5baf254c075e7492df
Reviewed-on: https://dart-review.googlesource.com/c/85286
Reviewed-by: Vyacheslav Egorov <vegorov@google.com>
2018-11-23 13:48:08 +00:00
Vyacheslav Egorov c62af758ee [gardening] Switch apply.sh script to use bash instead of sh
R=sortie@google.com

Change-Id: I30d39d4edf864d0307d18c8fd095649cfe3ed17c
Reviewed-on: https://dart-review.googlesource.com/c/85284
Reviewed-by: Jonas Termansen <sortie@google.com>
2018-11-23 13:31:15 +00:00
Vyacheslav Egorov 01380ede49 [gardening] Expand 3xHEAD Flutter patch mechanism to support DEPS file changes.
We don't rerun gclient sync after applying patches so changes to Dart
dependencies were not picked up.

Change-Id: I4360ddf7f906ab0552bd3ae8abbe9210a785845a
Reviewed-on: https://dart-review.googlesource.com/c/85282
Auto-Submit: Vyacheslav Egorov <vegorov@google.com>
Reviewed-by: Martin Kustermann <kustermann@google.com>
Commit-Queue: Martin Kustermann <kustermann@google.com>
2018-11-23 13:10:25 +00:00
Alexander Aprelev fa862aa490 [hhh] Fix string comparison in apply.sh.
This is follow-up to https://dart-review.googlesource.com/73686.

Change-Id: Id2e6d16deef5d3655f7e80ea50181d39173069a5
Reviewed-on: https://dart-review.googlesource.com/73842
Reviewed-by: Martin Kustermann <kustermann@google.com>
2018-09-07 07:00:59 +00:00
Alexander Aprelev df1afc516e [hhh] Add flutter/flutter patching capability to hhh buildbot.
Change-Id: I6b7d96a335c7a8f130ad0c2388c7fb6ba38e2c83
Reviewed-on: https://dart-review.googlesource.com/73686
Reviewed-by: Martin Kustermann <kustermann@google.com>
2018-09-07 06:00:46 +00:00
Jonas Termansen e8ecb3bc08 Support incompatible Dart SDK changes with patches to the Flutter Engine.
The Dart SDK may change incompatibly and require a corresponding update to
the Flutter Engine when Flutter Enginer rolls its Dart SDK. The flutter
targets on Golem uses a 3-way HEAD of the Dart SDK, the Flutter Engine, and
the Flutter Framework, meaning that it needs to apply the corresponding
update to the Flutter Engine immediately. Otherwise the Flutter targets will
be broken and not successfully run benchmarks until the next Flutter roll.

This change lets the Dart SDK make incompatible changes that affects the
Flutter Engine by checking in the corresponding patch into the Dart SDK
along with the incompatible change. The build step will determine what the
latest roll is by looking up which Dart SDK Hash the Flutter Engine has
pinned. If a patch exists for that hash, then that patch is applied to the
Flutter Engine.

For instance, if the Flutter Engine commit ab12 has pinned the Dart SDK
commit cd34, then it the patch tools/patches/flutter-engine/cd34.patch is
applied. Once the Flutter Engine rolls its Dart Engine, usually by
applying an equivalent patch, the roll commit will start refering to an
non-existent patch and the HEADs will be built together pristine again.
Finally cd32.patch can be removed from new versions of the Dart SDK.

The tools/patches/flutter-engine/apply.sh script is applies such patches in
3-way HEAD builds. The create.sh script is meant to be used by developers
when making incompatible changes to the Dart SDK that affects the Flutter
Engine. The top level tools/3xhead_flutter_hooks.sh script is meant to be
used by the CI as forward compatibility if additional hooks are added in the
future.

Change-Id: Ibf8e125b26dac319ba1c5302c003d7668155336a
Reviewed-on: https://dart-review.googlesource.com/64684
Reviewed-by: Martin Kustermann <kustermann@google.com>
2018-07-12 15:47:16 +00:00