update

build_helper/__main__.py

@@ -16,7 +16,7 @@ def main() -> None:
     args = parser.parse_args()
     if args.config:
         import json
-        config = json.loads(args.config)
+        config = json.loads(bytes.fromhex(args.config).decode("utf-8"))
     match args.task:
         case "prepare":
             from .prepare import get_matrix, parse_configs, prepare

build_helper/build.py

@@ -1,11 +1,12 @@
 # SPDX-FileCopyrightText: Copyright (c) 2024 沉默の金 <cmzj@cmzj.org>
 # SPDX-License-Identifier: MIT
 import os
+import re
 import shutil
 import tarfile
 import tempfile
 import zipfile
-import re
+
 from actions_toolkit import core
 from actions_toolkit.github import Context
 
@@ -183,4 +184,4 @@ def build_image_builder(cfg: dict) -> None:
     uploader.add(f"Image_Builder-{cfg['name']}", bl_path, retention_days=1, compression_level=0)
 
     logger.info("删除旧缓存...")
-    del_cache(get_cache_restore_key(openwrt, cfg))
+    del_cache(get_cache_restore_key(openwrt, cfg))

build_helper/prepare.py

@@ -76,7 +76,7 @@ def get_matrix(configs: dict[str, dict]) -> str:
     matrix = {"include": []}
     for name, config in configs.items():
         config["name"] = name
-        matrix["include"].append({"name": name, "config": json.dumps(config, separators=(',', ':'))})
+        matrix["include"].append({"name": name, "config": gzip.compress(json.dumps(config, separators=(',', ':')).encode("utf-8")).hex().upper()})
     return json.dumps(matrix)
 
 
@@ -216,7 +216,7 @@ def prepare_cfg(config: dict[str, Any],
                 openwrt: OpenWrt,
                 cloned_repos: dict[tuple[str, str], str],
                 global_files_path: str,
-                compiler: str):
+                compiler: str) -> tuple[str, dict[str, Any], str]:
     logger.info("%s处理软件包...", cfg_name)
     for pkg_name, pkg in config["extpackages"].items():
         path = os.path.join(openwrt.path, "package", "cmzj_packages", pkg_name)