From fd70de22fb22453e040802d3d6788c7ed34588cf Mon Sep 17 00:00:00 2001 From: Hao Guan <10684225+hguandl@users.noreply.github.com> Date: Sat, 7 Mar 2026 13:05:07 +0800 Subject: [PATCH] chore: MaaDeps cache asset (#15933) --- src/MaaUtils | 2 +- tools/build_macos_universal.zsh | 2 +- tools/maadeps-download.py | 13 ++++++++++--- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/src/MaaUtils b/src/MaaUtils index 9b4b5f2dcd..dc6c8204c4 160000 --- a/src/MaaUtils +++ b/src/MaaUtils @@ -1 +1 @@ -Subproject commit 9b4b5f2dcde21344b237bfeb795e67a8eff2ce33 +Subproject commit dc6c8204c479c7dbbb6d1e6febe72870078b1f1e diff --git a/tools/build_macos_universal.zsh b/tools/build_macos_universal.zsh index 6291c113ea..82008829e3 100755 --- a/tools/build_macos_universal.zsh +++ b/tools/build_macos_universal.zsh @@ -10,7 +10,7 @@ pushd ${basedir} build_arch() { [[ $1 = "arm64" ]] && triplet="arm64-osx" || triplet="x64-osx" - python3 tools/maadeps-download.py ${triplet} + python3 tools/maadeps-download.py --cache-asset ${triplet} if [[ -n $(which ccache) ]]; then export CMAKE_C_COMPILER_LAUNCHER=ccache diff --git a/tools/maadeps-download.py b/tools/maadeps-download.py index 1bdd899eeb..05df8a0440 100644 --- a/tools/maadeps-download.py +++ b/tools/maadeps-download.py @@ -1,4 +1,5 @@ #!/usr/bin/env python3 +import argparse import sys from pathlib import Path @@ -11,10 +12,16 @@ from maadeps_download import main as download_main REPO = "MaaAssistantArknights/MaaDeps" VERSION = "v2.10.1-maa.1" +parser = argparse.ArgumentParser() +parser.add_argument("triplet", nargs="?") +parser.add_argument("--cache-asset", action="store_true") + if __name__ == "__main__": - if len(sys.argv) == 2: - target_triplet = sys.argv[1] + args = parser.parse_args() + + if args.triplet: + target_triplet = args.triplet else: target_triplet = detect_host_triplet() - download_main(target_triplet, REPO, VERSION) + download_main(target_triplet, REPO, VERSION, args.cache_asset)