From 50276fb9a2a1b4341341130692e5818800b42856 Mon Sep 17 00:00:00 2001 From: Befator Date: Sat, 18 Oct 2025 19:19:29 +0200 Subject: [PATCH] More fixes --- build.sh | 4 ++-- msys2_autobuild/cmd_clean_assets.py | 11 ++++++----- msys2_autobuild/cmd_clear_failed.py | 5 +++-- msys2_autobuild/queue.py | 5 +++-- 4 files changed, 14 insertions(+), 11 deletions(-) diff --git a/build.sh b/build.sh index 5ea0484..02a21d7 100644 --- a/build.sh +++ b/build.sh @@ -1,5 +1,5 @@ pacman --needed --noconfirm -S mingw-w64-x86_64-python-tabulate mingw-w64-x86_64-python-requests-cache OLD_ACLOCAL_PATH="${ACLOCAL_PATH}" -unset ACLOCAL_PATH / ~/build-temp -python -m msys2_autobuild build +unset ACLOCAL_PATH +python -m msys2_autobuild build / ~/build-temp -t msys,msys-src,mingw64,mingw32,mingw-src ACLOCAL_PATH="${OLD_ACLOCAL_PATH}" \ No newline at end of file diff --git a/msys2_autobuild/cmd_clean_assets.py b/msys2_autobuild/cmd_clean_assets.py index 83088d4..4292044 100644 --- a/msys2_autobuild/cmd_clean_assets.py +++ b/msys2_autobuild/cmd_clean_assets.py @@ -6,11 +6,11 @@ from gitea import Release, Attachment from .config import get_all_build_types from .gh import (get_asset_filename, get_current_repo, get_release, - get_release_assets) + get_release_assets, get_gitea) from .queue import get_buildqueue -def get_assets_to_delete() -> tuple[list[Release], list[Attachment]]: +def get_assets_to_delete() -> tuple[list[Release], list[tuple[Release, Attachment]]]: print("Fetching packages to build...") keep_patterns = [] @@ -59,7 +59,7 @@ def get_assets_to_delete() -> tuple[list[Release], list[Attachment]]: for release in get_all_releases(): r, a = get_to_delete(release) releases.extend(r) - assets.extend(a) + assets.extend(r, a) return releases, assets @@ -76,10 +76,11 @@ def clean_gha_assets(args: Any) -> None: get_release(repo, release.tag_name) print("Deleting assets...") - for asset in assets: + for release, asset in assets: print(f"Deleting {get_asset_filename(asset)}...") if not args.dry_run: - asset.delete_asset() + gitea = get_gitea() + gitea.repo_delete_release_attachment(repo.owner.login, repo.name, release.id, asset.id) def add_parser(subparsers: Any) -> None: diff --git a/msys2_autobuild/cmd_clear_failed.py b/msys2_autobuild/cmd_clear_failed.py index aeb8924..c467ca9 100644 --- a/msys2_autobuild/cmd_clear_failed.py +++ b/msys2_autobuild/cmd_clear_failed.py @@ -1,7 +1,7 @@ from typing import Any from .gh import (get_asset_filename, get_current_repo, get_release, - get_release_assets) + get_release_assets, get_gitea) from .queue import get_buildqueue_with_status @@ -33,7 +33,8 @@ def clear_failed_state(args: Any) -> None: asset = failed_map[name] print(f"Deleting {get_asset_filename(asset)}...") if not args.dry_run: - asset.delete_asset() + gitea = get_gitea() + gitea.repo_delete_release_attachment(repo.owner.login, repo.name, release.id, asset.id) def add_parser(subparsers: Any) -> None: diff --git a/msys2_autobuild/queue.py b/msys2_autobuild/queue.py index ddfb725..3139a86 100644 --- a/msys2_autobuild/queue.py +++ b/msys2_autobuild/queue.py @@ -251,8 +251,9 @@ def get_buildqueue_with_status(full_details: bool = False) -> list[Package]: for i, (asset, content) in enumerate( zip(assets_failed, executor.map(download_text_asset, assets_failed))): result = json.loads(content) - if result["urls"]: - failed_urls[get_asset_filename(asset)] = result["urls"] + #No more Github Action URLs + #if result["urls"]: + # failed_urls[get_asset_filename(asset)] = result["urls"] def pkg_is_done(build_type: BuildType, pkg: Package) -> bool: done_names = [get_asset_filename(a) for a in cached_assets.get_assets(build_type)]