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

Rework the upload-assets command

Browse Source 
Instead of requiring a package name just pass a directory and match all
packages.

Also make the package patterns more strict so .sig files don't match.

This makes uploading a directory full of packages easier.
This commit is contained in:
Christoph Reiter 2021-06-30 00:27:28 +02:00
parent d8c110587c
commit 7ca0610513
1 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
autobuild.py
View File

@ -101,10 +101,10 @@ class Package(dict):
def get_build_patterns(self, build_type: str) -> List[str]: def get_build_patterns(self, build_type: str) -> List[str]:
patterns = [] patterns = []
if build_type_is_src(build_type): if build_type_is_src(build_type):
patterns.append(f"{self['name']}-{self['version']}.src.tar.*") patterns.append(f"{self['name']}-{self['version']}.src.tar.gz")
elif build_type in (MINGW_ARCH_LIST + ["msys"]): elif build_type in (MINGW_ARCH_LIST + ["msys"]):
for item in self['packages'].get(build_type, []): for item in self['packages'].get(build_type, []):
patterns.append(f"{item}-{self['version']}-*.pkg.tar.*") patterns.append(f"{item}-{self['version']}-*.pkg.tar.zst")
else: else:
assert 0 assert 0
return patterns return patterns
@ -1044,29 +1044,32 @@ def get_repo_subdir(type_: str, asset: GitReleaseAsset) -> Path:
def upload_assets(args: Any) -> None: def upload_assets(args: Any) -> None:
repo = get_repo() repo = get_repo()
package_name = args.package_name package_name = args.package
src_dir = args.path src_dir = args.path
if src_dir is None:
src_dir = os.getcwd()
src_dir = os.path.abspath(src_dir) src_dir = os.path.abspath(src_dir)
for pkg in get_buildqueue_with_status(): pkgs = get_buildqueue_with_status()
if pkg["name"] == package_name:
break if package_name is not None:
else: for pkg in pkgs:
raise SystemExit(f"Package '{package_name}' not in the queue, check the 'show' command") if pkg["name"] == package_name:
break
else:
raise SystemExit(f"Package '{package_name}' not in the queue, check the 'show' command")
pkgs = [pkg]
patterns = [] patterns = []
repo_type = pkg.get_repo_type() for pkg in pkgs:
for build_type in pkg.get_build_types(): repo_type = pkg.get_repo_type()
status = pkg.get_status(build_type) for build_type in pkg.get_build_types():
status = pkg.get_status(build_type)
# ignore finished packages # ignore finished packages
if status in (PackageStatus.FINISHED, PackageStatus.FINISHED_BUT_BLOCKED, if status in (PackageStatus.FINISHED, PackageStatus.FINISHED_BUT_BLOCKED,
PackageStatus.FINISHED_BUT_INCOMPLETE): PackageStatus.FINISHED_BUT_INCOMPLETE):
continue continue
patterns.extend(pkg.get_build_patterns(build_type)) patterns.extend(pkg.get_build_patterns(build_type))
print(f"Looking for the following files in {src_dir}:") print(f"Looking for the following files in {src_dir}:")
for pattern in patterns: for pattern in patterns:
@ -1332,12 +1335,11 @@ def main(argv: List[str]):
sub = subparser.add_parser( sub = subparser.add_parser(
"upload-assets", help="Upload packages", allow_abbrev=False) "upload-assets", help="Upload packages", allow_abbrev=False)
sub.add_argument("package_name") sub.add_argument("path", help="Directory to look for packages in")
sub.add_argument( sub.add_argument(
"--dry-run", action="store_true", help="Only show what is going to be uploaded") "--dry-run", action="store_true", help="Only show what is going to be uploaded")
sub.add_argument("-p", "--path", action="store", help=( sub.add_argument("-p", "--package", action="store", help=(
"Directory to look for packages in " "Only upload files belonging to a particualr package (pkgbase)"))
"(defaults to the current working directory by default)"))
sub.set_defaults(func=upload_assets) sub.set_defaults(func=upload_assets)
sub = subparser.add_parser("clean-assets", help="Clean up GHA assets", allow_abbrev=False) sub = subparser.add_parser("clean-assets", help="Clean up GHA assets", allow_abbrev=False)