@@ -29,23 +29,18 @@ def _download(url: str, dest: Path, *, token: str | None = None, retries: int =
2929 if token :
3030 headers ["Authorization" ] = f"Bearer { token } "
3131
32- last_err : Exception | None = None
3332 for attempt in range (1 , retries + 1 ):
3433 try :
3534 req = urllib .request .Request (url , headers = headers )
3635 with urllib .request .urlopen (req , timeout = timeout ) as resp , dest .open ("wb" ) as f :
3736 shutil .copyfileobj (resp , f )
3837 return
3938 except Exception as e :
40- last_err = e
4139 if attempt < retries :
4240 time .sleep (2 * attempt )
4341 else :
4442 raise
4543
46- if last_err :
47- raise last_err
48-
4944
5045def _fetch_json (url : str , * , token : str | None = None , timeout : int = 60 ) -> object :
5146 headers = {
@@ -292,15 +287,15 @@ def expand_zip_into_named_folder(url: str, download_path: Path, dest_root: Path,
292287 # 清理临时模型目录(避免打包进 Full/Full-Environment)
293288 shutil .rmtree (temp_dir , ignore_errors = True )
294289
295- # 6 . Full 包清单 + 打包(在 repo_root 下打包全部内容;zip 输出在 dist_dir 以避免自包含)
290+ # 7 . Full 包清单 + 打包(在 repo_root 下打包全部内容;zip 输出在 dist_dir 以避免自包含)
296291 _log ("Generate install manifest (Full)" )
297292 _run ([sys .executable , "tools/ci/generate_install_manifest.py" , "--output" , "install_manifest.json" ], cwd = repo_root )
298293
299294 full_zip = dist_dir / f"ZenlessZoneZero-OneDragon-{ release_version } -Full.zip"
300295 _log (f"Create Full zip: { full_zip } " )
301296 _zip_dir_contents (repo_root , full_zip , root_prefix = f"ZenlessZoneZero-OneDragon-{ release_version } -Full" )
302297
303- # 7 . Full-Environment:把环境包放入 .install 后重新生成清单并打包
298+ # 8 . Full-Environment:把环境包放入 .install 后重新生成清单并打包
304299 env_zip = dist_dir / "ZenlessZoneZero-OneDragon-Environment.zip"
305300 if not env_zip .exists ():
306301 raise SystemExit (f"Missing { env_zip } " )
@@ -314,10 +309,10 @@ def expand_zip_into_named_folder(url: str, download_path: Path, dest_root: Path,
314309 _log (f"Create Full-Environment zip: { full_env_zip } " )
315310 _zip_dir_contents (repo_root , full_env_zip , root_prefix = f"ZenlessZoneZero-OneDragon-{ release_version } -Full-Environment" )
316311
317- # 8 . 复制安装器到版本化文件名
312+ # 9 . 复制安装器到版本化文件名
318313 shutil .copy2 (repo_root / "OneDragon-Installer.exe" , repo_root / f"ZenlessZoneZero-OneDragon-{ release_version } -Installer.exe" )
319314
320- # 9 . 把 dist_dir 下所有 zip 移到 repo_root,供 release step 上传
315+ # 10 . 把 dist_dir 下所有 zip 移到 repo_root,供 release step 上传
321316 for z in dist_dir .glob ("*.zip" ):
322317 _log (f"Move zip to repo root: { z .name } " )
323318 shutil .move (str (z ), str (repo_root / z .name ))
0 commit comments