bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

bootstrap.py: use git rev-list for robustness

Browse source 
Use `git rev-list` instead of `git log` to be more robust against
UI changes in git. Also, use the full email address for bors,
because `--author` uses a substring match.
This commit is contained in:
Taylor Yu 2021-07-27 18:14:37 -05:00
parent 1259742865
commit 5d285206ad
1 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/bootstrap/bootstrap.py
View file

@ -464,7 +464,8 @@ class RustBuild(object):
# LLVM more often than necessary.
#
# This git command finds that commit SHA, looking for bors-authored
# merges that modified src/llvm-project.
# commits that modified src/llvm-project or other relevant version
# stamp files.
#
# This works even in a repository that has not yet initialized
# submodules.
@ -472,8 +473,8 @@ class RustBuild(object):
"git", "rev-parse", "--show-toplevel",
]).decode(sys.getdefaultencoding()).strip()
llvm_sha = subprocess.check_output([
"git", "log", "--author=bors", "--format=%H", "-n1",
"--no-patch", "--first-parent",
"git", "rev-list", "--author=bors@rust-lang.org", "-n1",
"--first-parent", "HEAD",
"--",
"{}/src/llvm-project".format(top_level),
"{}/src/bootstrap/download-ci-llvm-stamp".format(top_level),
@ -665,7 +666,7 @@ class RustBuild(object):
# Look for a version to compare to based on the current commit.
# Only commits merged by bors will have CI artifacts.
merge_base = ["git", "log", "--author=bors", "--pretty=%H", "-n1"]
merge_base = ["git", "rev-list", "--author=bors@rust-lang.org", "-n1", "HEAD"]
commit = subprocess.check_output(merge_base, universal_newlines=True).strip()
# Warn if there were changes to the compiler or standard library since the ancestor commit.