diff options
Diffstat (limited to 'llvm_tools')
| -rwxr-xr-x | llvm_tools/get_llvm_hash.py | 2 | ||||
| -rwxr-xr-x | llvm_tools/git_llvm_rev.py | 4 | ||||
| -rwxr-xr-x | llvm_tools/llvm_bisection.py | 9 | ||||
| -rwxr-xr-x | llvm_tools/llvm_bisection_unittest.py | 2 |
4 files changed, 9 insertions, 8 deletions
diff --git a/llvm_tools/get_llvm_hash.py b/llvm_tools/get_llvm_hash.py index 4c479962..329e8292 100755 --- a/llvm_tools/get_llvm_hash.py +++ b/llvm_tools/get_llvm_hash.py @@ -293,7 +293,7 @@ class LLVMHash(object): def GetTopOfTrunkGitHash(self): """Gets the latest git hash from top of trunk of LLVM.""" - path_to_main_branch = 'refs/heads/master' + path_to_main_branch = 'refs/heads/main' llvm_tot_git_hash = check_output( ['git', 'ls-remote', _LLVM_GIT_URL, path_to_main_branch]) return llvm_tot_git_hash.rstrip().split()[0] diff --git a/llvm_tools/git_llvm_rev.py b/llvm_tools/git_llvm_rev.py index 07209f1e..c8c1505c 100755 --- a/llvm_tools/git_llvm_rev.py +++ b/llvm_tools/git_llvm_rev.py @@ -7,7 +7,7 @@ """Maps LLVM git SHAs to synthetic revision numbers and back. Revision numbers are all of the form '(branch_name, r1234)'. As a shorthand, -r1234 is parsed as '(master, 1234)'. +r1234 is parsed as '(main, 1234)'. """ from __future__ import print_function @@ -18,7 +18,7 @@ import subprocess import sys import typing as t -MAIN_BRANCH = 'master' +MAIN_BRANCH = 'main' # Note that after base_llvm_sha, we reach The Wild West(TM) of commits. # So reasonable input that could break us includes: diff --git a/llvm_tools/llvm_bisection.py b/llvm_tools/llvm_bisection.py index c8d694cd..b1898ea9 100755 --- a/llvm_tools/llvm_bisection.py +++ b/llvm_tools/llvm_bisection.py @@ -357,13 +357,14 @@ def main(args_output): print(skip_revisions_message) if args_output.cleanup: - # Abondon all the CLs created for bisection + # Abandon all the CLs created for bisection gerrit = os.path.join(args_output.chroot_path, 'chromite/bin/gerrit') for build in bisect_state['jobs']: try: - subprocess.check_output([gerrit, 'abandon', build['cl']], - stderr=subprocess.STDOUT, - encoding='utf-8') + subprocess.check_output( + [gerrit, 'abandon', str(build['cl'])], + stderr=subprocess.STDOUT, + encoding='utf-8') except subprocess.CalledProcessError as err: # the CL may have been abandoned if 'chromite.lib.gob_util.GOBError' not in err.output: diff --git a/llvm_tools/llvm_bisection_unittest.py b/llvm_tools/llvm_bisection_unittest.py index a40770a5..cc22dfa4 100755 --- a/llvm_tools/llvm_bisection_unittest.py +++ b/llvm_tools/llvm_bisection_unittest.py @@ -301,7 +301,7 @@ class LLVMBisectionTest(unittest.TestCase): [ os.path.join(args_output.chroot_path, 'chromite/bin/gerrit'), 'abandon', - cl, + str(cl), ], stderr=subprocess.STDOUT, encoding='utf-8', |