mirror of
https://github.com/servo/servo.git
synced 2025-08-06 22:15:33 +01:00
Update web-platform-tests to revision 0a28ecf697d96db228f8382db0e41f1c54314dad
This commit is contained in:
parent
1ff56aa84f
commit
52045cb370
106 changed files with 1208 additions and 778 deletions
|
@ -223,7 +223,7 @@ def setup_environment(args):
|
|||
|
||||
def setup_repository():
|
||||
if os.environ.get("GITHUB_PULL_REQUEST", "false") != "false":
|
||||
parents = run(["git", "show", "--format=%P", "task_head"], return_stdout=True).strip().split()
|
||||
parents = run(["git", "show", "--no-patch", "--format=%P", "task_head"], return_stdout=True).strip().split()
|
||||
if len(parents) == 2:
|
||||
base_head = parents[0]
|
||||
pr_head = parents[1]
|
||||
|
@ -233,6 +233,9 @@ def setup_repository():
|
|||
else:
|
||||
print("ERROR: Pull request HEAD wasn't a 2-parent merge commit; "
|
||||
"expected to test the merge of PR into the base")
|
||||
commit = run(["git", "show", "--no-patch", "--format=%H", "task_head"], return_stdout=True).strip()
|
||||
print("HEAD: %s" % commit)
|
||||
print("Parents: %s" % ", ".join(parents))
|
||||
sys.exit(1)
|
||||
|
||||
branch = os.environ.get("GITHUB_BRANCH")
|
||||
|
@ -260,6 +263,8 @@ def main():
|
|||
|
||||
job = args.job
|
||||
|
||||
print("Job %s" % job)
|
||||
|
||||
run_if = [(lambda: job == "all", "job set to 'all'"),
|
||||
(lambda:"all" in extra_jobs, "Manually specified jobs includes 'all'"),
|
||||
(lambda:job in extra_jobs, "Manually specified jobs includes '%s'" % job),
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue