Befator-Inc-Firmen-Netzwerk/msys2-autobuild
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 10 Wiki Activity

also add optional deps when checking if we should run

Browse Source
This commit is contained in:
Christoph Reiter 2022-03-30 17:17:04 +02:00
parent 5f628fb63a
commit 5e037680d6
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
autobuild.py
View File

@ -597,8 +597,7 @@ def run_build(args: Any) -> None:
else: else:
build_types = [p.strip() for p in args.build_types.split(",")] build_types = [p.strip() for p in args.build_types.split(",")]
for dep, ignored in parse_optional_deps(args.optional_deps or "").items(): apply_optional_deps(args.optional_deps or "")
Config.OPTIONAL_DEPS.setdefault(dep, []).extend(ignored)
start_time = time.monotonic() start_time = time.monotonic()
@ -1051,9 +1050,16 @@ def parse_optional_deps(optional_deps: str) -> Dict[str, List[str]]:
return res return res
def apply_optional_deps(optional_deps: str) -> None:
for dep, ignored in parse_optional_deps(optional_deps).items():
Config.OPTIONAL_DEPS.setdefault(dep, []).extend(ignored)
def write_build_plan(args: Any) -> None: def write_build_plan(args: Any) -> None:
target_file = args.target_file target_file = args.target_file
optional_deps = args.optional_deps optional_deps = args.optional_deps or ""
apply_optional_deps(optional_deps)
current_id = None current_id = None
if "GITHUB_RUN_ID" in os.environ: if "GITHUB_RUN_ID" in os.environ:
@ -1106,7 +1112,7 @@ def write_build_plan(args: Any) -> None:
job = job_info["matrix"] job = job_info["matrix"]
# TODO: pin optional deps to their exact version somehow, in case something changes # TODO: pin optional deps to their exact version somehow, in case something changes
# between this run and when the worker gets to it. # between this run and when the worker gets to it.
job["build-args"] = job["build-args"] + " --optional-deps " + shlex.quote(optional_deps or "") job["build-args"] = job["build-args"] + " --optional-deps " + shlex.quote(optional_deps)
jobs.append(job) jobs.append(job)
# XXX: If there is more than three builds we start two jobs with the second # XXX: If there is more than three builds we start two jobs with the second
# one having a reversed build order # one having a reversed build order