diff options
| author | George Burgess IV <gbiv@google.com> | 2022-02-01 10:18:09 -0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2022-02-02 07:14:33 +0000 |
| commit | 872c973050d1b105c054e1724d1201797d2f8bae (patch) | |
| tree | 6d75024624cead09915cdfbfa3566bcfe6b95222 | |
| parent | 3dc6ca12ad631a8826fed1558d877982ce3a0bb3 (diff) | |
| download | toolchain-utils-872c973050d1b105c054e1724d1201797d2f8bae.tar.gz | |
nightly_revert_checker: fix breakage
We were missing `platforms` here, leading to crashes. Seems best to
default to all platforms getting each revert.
BUG=b:216107005
TEST=Ran the revert checker; no more crashes.
Change-Id: I44658bb01e1c45977ed70c77572cac8a1fd61586
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/toolchain-utils/+/3429680
Reviewed-by: Jordan Abrahams-Whitehead <ajordanr@google.com>
Commit-Queue: George Burgess <gbiv@chromium.org>
Tested-by: George Burgess <gbiv@chromium.org>
| -rwxr-xr-x | llvm_tools/nightly_revert_checker.py | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/llvm_tools/nightly_revert_checker.py b/llvm_tools/nightly_revert_checker.py index 5e878816..8e3fcf57 100755 --- a/llvm_tools/nightly_revert_checker.py +++ b/llvm_tools/nightly_revert_checker.py @@ -32,8 +32,8 @@ import get_upstream_patch State = t.Any -def _find_interesting_android_shas(android_llvm_toolchain_dir: str - ) -> t.List[t.Tuple[str, str]]: +def _find_interesting_android_shas( + android_llvm_toolchain_dir: str) -> t.List[t.Tuple[str, str]]: llvm_project = os.path.join(android_llvm_toolchain_dir, 'toolchain/llvm-project') @@ -54,8 +54,8 @@ def _find_interesting_android_shas(android_llvm_toolchain_dir: str return result -def _parse_llvm_ebuild_for_shas(ebuild_file: io.TextIOWrapper - ) -> t.List[t.Tuple[str, str]]: +def _parse_llvm_ebuild_for_shas( + ebuild_file: io.TextIOWrapper) -> t.List[t.Tuple[str, str]]: def parse_ebuild_assignment(line: str) -> str: no_comments = line.split('#')[0] no_assign = no_comments.split('=', 1)[1].strip() @@ -82,8 +82,8 @@ def _parse_llvm_ebuild_for_shas(ebuild_file: io.TextIOWrapper return results -def _find_interesting_chromeos_shas(chromeos_base: str - ) -> t.List[t.Tuple[str, str]]: +def _find_interesting_chromeos_shas( + chromeos_base: str) -> t.List[t.Tuple[str, str]]: llvm_dir = os.path.join(chromeos_base, 'src/third_party/chromiumos-overlay/sys-devel/llvm') candidate_ebuilds = [ @@ -230,12 +230,15 @@ def do_cherrypick(chroot_path: str, llvm_dir: str, seen.add(friendly_name) for sha, reverted_sha in reverts: try: + # We upload reverts for all platforms by default, since there's no + # real reason for them to be CrOS-specific. get_upstream_patch.get_from_upstream(chroot_path=chroot_path, create_cl=True, start_sha=reverted_sha, patches=[sha], reviewers=reviewers, - cc=cc) + cc=cc, + platforms=()) except get_upstream_patch.CherrypickError as e: logging.info('%s, skipping...', str(e)) return new_state @@ -324,8 +327,9 @@ def parse_args(argv: t.List[str]) -> t.Any: return parser.parse_args(argv) -def find_chroot(opts: t.Any, reviewers: t.List[str], cc: t.List[str] - ) -> t.Tuple[str, t.List[t.Tuple[str, str]], _EmailRecipients]: +def find_chroot( + opts: t.Any, reviewers: t.List[str], cc: t.List[str] +) -> t.Tuple[str, t.List[t.Tuple[str, str]], _EmailRecipients]: recipients = reviewers + cc if opts.repository == 'chromeos': chroot_path = opts.chromeos_dir |