Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-28 11:03:39 +01:00
Code Issues Projects Releases Packages Wiki Activity

Index tasks by git tree hash instead of parent commits hashes

Browse source
This commit is contained in:
Simon Sapin 2020-03-19 18:26:49 +01:00
parent 8fff3e206f
commit fa625a7388
1 changed files with 6 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

23
etc/taskcluster/decisionlib.py
View file

@ -65,23 +65,12 @@ class Config:
def task_id(self): def task_id(self):
if hasattr(self, "_task_id"): if not hasattr(self, "_task_id"):
return self._task_id # Use the SHA-1 hash of the git "tree" object rather than the commit.
# If the head commit is a merge, we want to generate a unique task id which incorporates # A `@bors-servo retry` command creates a new merge commit with a different commit hash
# the merge parents rather that the actual sha of the merge commit. This ensures that tasks # but with the same tree hash.
# can be reused if the tree is in an identical state. Otherwise, if the head commit is output = subprocess.check_output(["git", "show", "-s", "--format=%T", "HEAD"])
# not a merge, we can rely on the head commit sha for that purpose. self._task_id = output.decode("utf-8").strip()
raw_commit = subprocess.check_output(["git", "cat-file", "commit", "HEAD"])
parent_commits = [
value.decode("utf8")
for line in raw_commit.split(b"\n")
for key, _, value in [line.partition(b" ")]
if key == b"parent"
]
if len(parent_commits) > 1:
self._task_id = "-".join(parent_commits) # pragma: no cover
else:
self._task_id = self.git_sha # pragma: no cover
return self._task_id return self._task_id
def git_sha_is_current_head(self): def git_sha_is_current_head(self):