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

Move some global state into a function

Browse Source
This commit is contained in:
Christoph Reiter 2021-07-17 18:30:50 +02:00
parent 32d83dcdad
commit e45ceae224
1 changed files with 69 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

136
autobuild.py
View File

@ -856,75 +856,77 @@ def get_workflow():
raise Exception("workflow not found:", workflow_name) raise Exception("workflow not found:", workflow_name)
JOB_META: List[Dict[str, Any]] = [ def get_job_meta() -> List[Dict[str, Any]]:
{ job_meta: List[Dict[str, Any]] = [
"build-types": ["mingw64"], {
"matrix": { "build-types": ["mingw64"],
"packages": "base-devel mingw-w64-x86_64-toolchain git", "matrix": {
"build-args": "--build-types mingw64", "packages": "base-devel mingw-w64-x86_64-toolchain git",
"name": "mingw64", "build-args": "--build-types mingw64",
"runner": "windows-latest" "name": "mingw64",
"runner": "windows-latest"
}
}, {
"build-types": ["mingw32"],
"matrix": {
"packages": "base-devel mingw-w64-i686-toolchain git",
"build-args": "--build-types mingw32",
"name": "mingw32",
"runner": "windows-latest"
}
}, {
"build-types": ["ucrt64"],
"matrix": {
"packages": "base-devel mingw-w64-ucrt-x86_64-toolchain git",
"build-args": "--build-types ucrt64",
"name": "ucrt64",
"runner": "windows-latest"
}
}, {
"build-types": ["clang64"],
"matrix": {
"packages": "base-devel mingw-w64-clang-x86_64-toolchain git",
"build-args": "--build-types clang64",
"name": "clang64",
"runner": "windows-latest"
}
}, {
"build-types": ["clang32"],
"matrix": {
"packages": "base-devel git",
"build-args": "--build-types clang32",
"name": "clang32",
"runner": "windows-latest"
}
}, {
"build-types": ["clangarm64"],
"matrix": {
"packages": "base-devel git",
"build-args": "--build-types clangarm64",
"name": "clangarm64",
"runner": ["Windows", "ARM64"]
}
}, {
"build-types": ["msys", "msys-src"],
"matrix": {
"packages": "base-devel msys2-devel git",
"build-args": "--build-types msys,msys-src",
"name": "msys",
"runner": "windows-latest"
}
} }
}, { ]
"build-types": ["mingw32"],
"matrix": {
"packages": "base-devel mingw-w64-i686-toolchain git",
"build-args": "--build-types mingw32",
"name": "mingw32",
"runner": "windows-latest"
}
}, {
"build-types": ["ucrt64"],
"matrix": {
"packages": "base-devel mingw-w64-ucrt-x86_64-toolchain git",
"build-args": "--build-types ucrt64",
"name": "ucrt64",
"runner": "windows-latest"
}
}, {
"build-types": ["clang64"],
"matrix": {
"packages": "base-devel mingw-w64-clang-x86_64-toolchain git",
"build-args": "--build-types clang64",
"name": "clang64",
"runner": "windows-latest"
}
}, {
"build-types": ["clang32"],
"matrix": {
"packages": "base-devel git",
"build-args": "--build-types clang32",
"name": "clang32",
"runner": "windows-latest"
}
}, {
"build-types": ["clangarm64"],
"matrix": {
"packages": "base-devel git",
"build-args": "--build-types clangarm64",
"name": "clangarm64",
"runner": ["Windows", "ARM64"]
}
}, {
"build-types": ["msys", "msys-src"],
"matrix": {
"packages": "base-devel msys2-devel git",
"build-args": "--build-types msys,msys-src",
"name": "msys",
"runner": "windows-latest"
}
}
]
# The job matching MINGW_SRC_ARCH should also build mingw-src
for meta in job_meta:
if Config.MINGW_SRC_ARCH in meta["build-types"]:
meta["build-types"].append("mingw-src")
meta["matrix"]["build-args"] = meta["matrix"]["build-args"] + ",mingw-src"
break
else:
raise Exception("Didn't find arch for building mingw-src")
# The job matching MINGW_SRC_ARCH should also build mingw-src return job_meta
for meta in JOB_META:
if Config.MINGW_SRC_ARCH in meta["build-types"]:
meta["build-types"].append("mingw-src")
meta["matrix"]["build-args"] = meta["matrix"]["build-args"] + ",mingw-src"
break
else:
raise Exception("Didn't find arch for building mingw-src")
def write_build_plan(args: Any): def write_build_plan(args: Any):
@ -965,7 +967,7 @@ def write_build_plan(args: Any):
return return
jobs = [] jobs = []
for job_info in JOB_META: for job_info in get_job_meta():
matching_build_types = set(queued_build_types) & set(job_info["build-types"]) matching_build_types = set(queued_build_types) & set(job_info["build-types"])
if matching_build_types: if matching_build_types:
build_count = sum(queued_build_types[bt] for bt in matching_build_types) build_count = sum(queued_build_types[bt] for bt in matching_build_types)