mirror of
https://github.com/servo/servo.git
synced 2025-07-23 07:13:52 +01:00
Matrix in CI and mach try
with presets (#31141)
* Matrix in CI and mach try with presets * small fixups * names in trigger try run comment * let * f * rename step * fix running try on win * fix try branch full * py3.10 * typo * Make unit-tests default to false, except in basic os runs Fixes https://github.com/servo/servo/issues/31174 * make full use linux-wpt & linux-wpt also include unit-tests so full is equal to main workflow * Stylish fixes * cmp json as dict
This commit is contained in:
parent
266a082206
commit
a5c512808a
9 changed files with 582 additions and 322 deletions
|
@ -22,17 +22,7 @@ from mach.decorators import (
|
|||
)
|
||||
|
||||
from servo.command_base import CommandBase, cd, call
|
||||
|
||||
VALID_TRY_BRACHES = [
|
||||
"try",
|
||||
"try-linux",
|
||||
"try-mac",
|
||||
"try-windows",
|
||||
"try-wpt",
|
||||
"try-wpt-2020",
|
||||
"try-wpt-mac",
|
||||
"try-wpt-mac-2020"
|
||||
]
|
||||
from servo.try_parser import Config
|
||||
|
||||
|
||||
@CommandProvider
|
||||
|
@ -284,38 +274,35 @@ class MachCommands(CommandBase):
|
|||
return p.wait()
|
||||
|
||||
@Command('try',
|
||||
description='Runs try jobs by force pushing to personal fork try branches',
|
||||
description='Runs try jobs by force pushing to try branch',
|
||||
category='devenv')
|
||||
@CommandArgument(
|
||||
'jobs', default=["try"], nargs='...',
|
||||
help="Name(s) of job(s) (ex: try, linux, mac, windows, wpt)")
|
||||
def try_jobs(self, jobs):
|
||||
branches = []
|
||||
# we validate branches because force pushing is destructive
|
||||
for job in jobs:
|
||||
# branches must start with try-
|
||||
if "try" not in job:
|
||||
job = "try-" + job
|
||||
if job not in VALID_TRY_BRACHES:
|
||||
print(job + " job doesn't exist")
|
||||
return -1
|
||||
branches.append(job)
|
||||
remote = "origin"
|
||||
if "servo/servo" in subprocess.check_output(["git", "config", "--get", "remote.origin.url"]).decode():
|
||||
# if we have servo/servo for origin check try remote
|
||||
try:
|
||||
if "servo/servo" in subprocess.check_output(["git", "config", "--get", "remote.try.url"]).decode():
|
||||
# User has servo/servo for try remote
|
||||
print("You should not use servo/servo for try remote!")
|
||||
return -1
|
||||
else:
|
||||
remote = "try"
|
||||
except subprocess.CalledProcessError:
|
||||
print("It looks like you are patching in upstream servo.")
|
||||
print("Set try remote to your personal fork with `git remote add try https://github.com/user/servo`")
|
||||
return -1
|
||||
for b in branches:
|
||||
res = call(["git", "push", remote, "--force", f"HEAD:{b}"], env=self.build_env())
|
||||
if res != 0:
|
||||
return res
|
||||
return 0
|
||||
'--remote', '-r', default="origin",
|
||||
help='git remote to use for try pushes')
|
||||
@CommandArgument(
|
||||
'try_string', default=None, nargs='...',
|
||||
help="Try string")
|
||||
def try_jobs(self, remote="origin", try_string=None):
|
||||
if not try_string:
|
||||
try_string = "full"
|
||||
else:
|
||||
try_string = " ".join(try_string)
|
||||
conf = Config(try_string)
|
||||
result = call(["git", "commit", "--allow-empty", "-m", try_string, "-m", f"{conf.to_json()}"])
|
||||
if result != 0:
|
||||
return result
|
||||
|
||||
git_remote = subprocess.check_output(["git", "config", "--get", f"remote.{remote}.url"]).decode()
|
||||
if "servo/servo" in git_remote:
|
||||
print("WARNING: You are triggering try build in upstream repo!")
|
||||
|
||||
result = call(["git", "push", remote, "--force", "HEAD:try"])
|
||||
if result != 0:
|
||||
return result
|
||||
|
||||
git_remote = git_remote.replace(".git", "/actions")
|
||||
print(f"You can find triggered workflow here: {git_remote}")
|
||||
|
||||
# Remove the last commit which only contains the try configuration.
|
||||
result += call(["git", "reset", "--soft", "HEAD~1"])
|
||||
return result
|
||||
|
|
|
@ -244,6 +244,10 @@ class MachCommands(CommandBase):
|
|||
print("Running tidy tests...")
|
||||
passed = tidy.run_tests() and passed
|
||||
|
||||
import python.servo.try_parser as try_parser
|
||||
print("Running try_parser tests...")
|
||||
passed = try_parser.run_tests() and passed
|
||||
|
||||
print("Running WPT tests...")
|
||||
passed = wpt.run_tests() and passed
|
||||
|
||||
|
|
203
python/servo/try_parser.py
Normal file
203
python/servo/try_parser.py
Normal file
|
@ -0,0 +1,203 @@
|
|||
#!/usr/bin/env python
|
||||
|
||||
# Copyright 2023 The Servo Project Developers. See the COPYRIGHT
|
||||
# file at the top-level directory of this distribution.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
|
||||
# http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
|
||||
# <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
|
||||
# option. This file may not be copied, modified, or distributed
|
||||
# except according to those terms.
|
||||
|
||||
import json
|
||||
import sys
|
||||
from typing import Optional
|
||||
import unittest
|
||||
import logging
|
||||
|
||||
from dataclasses import dataclass
|
||||
from enum import Enum, Flag, auto
|
||||
|
||||
|
||||
class Layout(Flag):
|
||||
none = 0
|
||||
layout2013 = auto()
|
||||
layout2020 = auto()
|
||||
|
||||
@staticmethod
|
||||
def all():
|
||||
return Layout.layout2013 | Layout.layout2020
|
||||
|
||||
def to_string(self):
|
||||
if Layout.all() in self:
|
||||
return "all"
|
||||
elif Layout.layout2020 in self:
|
||||
return "2020"
|
||||
elif Layout.layout2013 in self:
|
||||
return "2013"
|
||||
else:
|
||||
return "none"
|
||||
|
||||
|
||||
class Workflow(str, Enum):
|
||||
LINUX = 'linux'
|
||||
MACOS = 'macos'
|
||||
WINDOWS = 'windows'
|
||||
ANDROID = 'android'
|
||||
|
||||
|
||||
@dataclass
|
||||
class JobConfig(object):
|
||||
name: str
|
||||
workflow: Workflow = Workflow.LINUX
|
||||
wpt_layout: Layout = Layout.none
|
||||
profile: str = "release"
|
||||
unit_tests: bool = False
|
||||
wpt_tests_to_run: str = ""
|
||||
|
||||
|
||||
def handle_preset(s: str) -> Optional[JobConfig]:
|
||||
s = s.lower()
|
||||
|
||||
if s == "linux":
|
||||
return JobConfig("Linux", Workflow.LINUX, unit_tests=True)
|
||||
elif s in ["mac", "macos"]:
|
||||
return JobConfig("MacOS", Workflow.MACOS, unit_tests=True)
|
||||
elif s in ["win", "windows"]:
|
||||
return JobConfig("Windows", Workflow.WINDOWS, unit_tests=True)
|
||||
elif s in ["wpt", "linux-wpt"]:
|
||||
return JobConfig("Linux WPT", Workflow.LINUX, unit_tests=True, wpt_layout=Layout.all())
|
||||
elif s in ["wpt-2013", "linux-wpt-2013"]:
|
||||
return JobConfig("Linux WPT legacy-layout", Workflow.LINUX, wpt_layout=Layout.layout2013)
|
||||
elif s in ["wpt-2020", "linux-wpt-2020"]:
|
||||
return JobConfig("Linux WPT layout-2020", Workflow.LINUX, wpt_layout=Layout.layout2020)
|
||||
elif s in ["mac-wpt", "wpt-mac"]:
|
||||
return JobConfig("MacOS WPT", Workflow.MACOS, wpt_layout=Layout.all())
|
||||
elif s == "mac-wpt-2013":
|
||||
return JobConfig("MacOS WPT legacy-layout", Workflow.MACOS, wpt_layout=Layout.layout2013)
|
||||
elif s == "mac-wpt-2020":
|
||||
return JobConfig("MacOS WPT layout-2020", Workflow.MACOS, wpt_layout=Layout.layout2020)
|
||||
elif s == "android":
|
||||
return JobConfig("Android", Workflow.ANDROID)
|
||||
elif s == "webgpu":
|
||||
return JobConfig("WebGPU CTS", Workflow.LINUX,
|
||||
wpt_layout=Layout.layout2020, # reftests are mode for new layout
|
||||
wpt_tests_to_run="_webgpu", # run only webgpu cts
|
||||
profile="production", # WebGPU works to slow with debug assert
|
||||
unit_tests=False) # production profile does not work with unit-tests
|
||||
else:
|
||||
return None
|
||||
|
||||
|
||||
class Encoder(json.JSONEncoder):
|
||||
def default(self, o):
|
||||
if isinstance(o, (Config, JobConfig)):
|
||||
return o.__dict__
|
||||
if isinstance(o, Layout):
|
||||
return o.to_string()
|
||||
return json.JSONEncoder.default(self, o)
|
||||
|
||||
|
||||
class Config(object):
|
||||
def __init__(self, s: Optional[str] = None):
|
||||
self.fail_fast: bool = False
|
||||
self.matrix: list[JobConfig] = list()
|
||||
if s is not None:
|
||||
self.parse(s)
|
||||
|
||||
def parse(self, input: str):
|
||||
input = input.lower().strip()
|
||||
|
||||
if not input:
|
||||
input = "full"
|
||||
|
||||
words: list[str] = input.split(" ")
|
||||
|
||||
for word in words:
|
||||
# Handle keywords.
|
||||
if word in ["fail-fast", "failfast", "fail_fast"]:
|
||||
self.fail_fast = True
|
||||
continue # skip over keyword
|
||||
if word == "full":
|
||||
words.extend(["linux-wpt", "macos", "windows", "android"])
|
||||
continue # skip over keyword
|
||||
|
||||
preset = handle_preset(word)
|
||||
if preset is None:
|
||||
print(f"Ignoring unknown preset {word}")
|
||||
else:
|
||||
self.matrix.append(preset)
|
||||
|
||||
def to_json(self) -> str:
|
||||
return json.dumps(self, cls=Encoder)
|
||||
|
||||
|
||||
def main():
|
||||
conf = Config(" ".join(sys.argv[1:]))
|
||||
print(conf.to_json())
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
main()
|
||||
|
||||
|
||||
class TestParser(unittest.TestCase):
|
||||
def test_string(self):
|
||||
self.assertDictEqual(json.loads(Config("linux fail-fast").to_json()),
|
||||
{'fail_fast': True,
|
||||
'matrix': [{
|
||||
'name': 'Linux',
|
||||
'profile': 'release',
|
||||
'unit_tests': True,
|
||||
'workflow': 'linux',
|
||||
'wpt_layout': 'none',
|
||||
'wpt_tests_to_run': ''
|
||||
}]
|
||||
})
|
||||
|
||||
def test_empty(self):
|
||||
self.assertDictEqual(json.loads(Config("").to_json()),
|
||||
{"fail_fast": False, "matrix": [
|
||||
{
|
||||
"name": "Linux WPT",
|
||||
"workflow": "linux",
|
||||
"wpt_layout": "all",
|
||||
"profile": "release",
|
||||
"unit_tests": True,
|
||||
"wpt_tests_to_run": ""
|
||||
},
|
||||
{
|
||||
"name": "MacOS",
|
||||
"workflow": "macos",
|
||||
"wpt_layout": "none",
|
||||
"profile": "release",
|
||||
"unit_tests": True,
|
||||
"wpt_tests_to_run": ""
|
||||
},
|
||||
{
|
||||
"name": "Windows",
|
||||
"workflow": "windows",
|
||||
"wpt_layout": "none",
|
||||
"profile": "release",
|
||||
"unit_tests": True,
|
||||
"wpt_tests_to_run": ""
|
||||
},
|
||||
{
|
||||
"name": "Android",
|
||||
"workflow": "android",
|
||||
"wpt_layout": "none",
|
||||
"profile": "release",
|
||||
"unit_tests": False,
|
||||
"wpt_tests_to_run": ""
|
||||
}
|
||||
]})
|
||||
|
||||
def test_full(self):
|
||||
self.assertDictEqual(json.loads(Config("linux-wpt macos windows android").to_json()),
|
||||
json.loads(Config("").to_json()))
|
||||
|
||||
|
||||
def run_tests():
|
||||
verbosity = 1 if logging.getLogger().level >= logging.WARN else 2
|
||||
suite = unittest.TestLoader().loadTestsFromTestCase(TestParser)
|
||||
return unittest.TextTestRunner(verbosity=verbosity).run(suite).wasSuccessful()
|
Loading…
Add table
Add a link
Reference in a new issue