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

More fixes
Some checks failed
test / test (ubuntu-24.04, 3.12) (push) Has been cancelled
test / test (ubuntu-24.04, 3.13) (push) Has been cancelled
test / test (windows-11-arm, 3.12) (push) Has been cancelled
test / test (windows-11-arm, 3.13) (push) Has been cancelled
test / test (windows-2022, 3.12) (push) Has been cancelled
test / test (windows-2022, 3.13) (push) Has been cancelled
test / zizmor (push) Has been cancelled
build / schedule (push) Has been cancelled
build / ${{ matrix.name }} (push) Has been cancelled

Browse Source
This commit is contained in:
Befator 2025-10-18 19:19:29 +02:00
parent 84c03f504e
commit 50276fb9a2
4 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build.sh
View File

@ -1,5 +1,5 @@
pacman --needed --noconfirm -S mingw-w64-x86_64-python-tabulate mingw-w64-x86_64-python-requests-cache pacman --needed --noconfirm -S mingw-w64-x86_64-python-tabulate mingw-w64-x86_64-python-requests-cache
OLD_ACLOCAL_PATH="${ACLOCAL_PATH}" OLD_ACLOCAL_PATH="${ACLOCAL_PATH}"
unset ACLOCAL_PATH / ~/build-temp unset ACLOCAL_PATH
python -m msys2_autobuild build python -m msys2_autobuild build / ~/build-temp -t msys,msys-src,mingw64,mingw32,mingw-src
ACLOCAL_PATH="${OLD_ACLOCAL_PATH}" ACLOCAL_PATH="${OLD_ACLOCAL_PATH}"

11
msys2_autobuild/cmd_clean_assets.py
View File

@ -6,11 +6,11 @@ from gitea import Release, Attachment
from .config import get_all_build_types from .config import get_all_build_types
from .gh import (get_asset_filename, get_current_repo, get_release, from .gh import (get_asset_filename, get_current_repo, get_release,
get_release_assets) get_release_assets, get_gitea)
from .queue import get_buildqueue 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...") print("Fetching packages to build...")
keep_patterns = [] keep_patterns = []
@ -59,7 +59,7 @@ def get_assets_to_delete() -> tuple[list[Release], list[Attachment]]:
for release in get_all_releases(): for release in get_all_releases():
r, a = get_to_delete(release) r, a = get_to_delete(release)
releases.extend(r) releases.extend(r)
assets.extend(a) assets.extend(r, a)
return releases, assets return releases, assets
@ -76,10 +76,11 @@ def clean_gha_assets(args: Any) -> None:
get_release(repo, release.tag_name) get_release(repo, release.tag_name)
print("Deleting assets...") print("Deleting assets...")
for asset in assets: for release, asset in assets:
print(f"Deleting {get_asset_filename(asset)}...") print(f"Deleting {get_asset_filename(asset)}...")
if not args.dry_run: 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: def add_parser(subparsers: Any) -> None:

5
msys2_autobuild/cmd_clear_failed.py
View File

@ -1,7 +1,7 @@
from typing import Any from typing import Any
from .gh import (get_asset_filename, get_current_repo, get_release, 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 from .queue import get_buildqueue_with_status
@ -33,7 +33,8 @@ def clear_failed_state(args: Any) -> None:
asset = failed_map[name] asset = failed_map[name]
print(f"Deleting {get_asset_filename(asset)}...") print(f"Deleting {get_asset_filename(asset)}...")
if not args.dry_run: 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: def add_parser(subparsers: Any) -> None:

5
msys2_autobuild/queue.py
View File

@ -251,8 +251,9 @@ def get_buildqueue_with_status(full_details: bool = False) -> list[Package]:
for i, (asset, content) in enumerate( for i, (asset, content) in enumerate(
zip(assets_failed, executor.map(download_text_asset, assets_failed))): zip(assets_failed, executor.map(download_text_asset, assets_failed))):
result = json.loads(content) result = json.loads(content)
if result["urls"]: #No more Github Action URLs
failed_urls[get_asset_filename(asset)] = result["urls"] #if result["urls"]:
# failed_urls[get_asset_filename(asset)] = result["urls"]
def pkg_is_done(build_type: BuildType, pkg: Package) -> bool: 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)] done_names = [get_asset_filename(a) for a in cached_assets.get_assets(build_type)]