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
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
This commit is contained in:
parent
84c03f504e
commit
50276fb9a2
4
build.sh
4
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}"
|
||||
@ -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:
|
||||
|
||||
@ -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:
|
||||
|
||||
@ -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)]
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user