refactor: simplify release fetching and harden nightly git diagnostics

Author: zouyonghe

.github/workflows/release.yml

@@ -77,7 +77,11 @@ jobs:
           elif [ -n "$dispatch_tag" ]; then
             tag="$dispatch_tag"
           else
-            tag="$(git describe --tags --abbrev=0)"
+            if ! tag="$(git describe --tags --abbrev=0 2>/tmp/git_describe_error.log)"; then
+              echo "Failed to resolve tag via git describe. Ensure repository history and tags are available." >&2
+              cat /tmp/git_describe_error.log >&2 || true
+              exit 1
+            fi
           fi
           if [ -z "$tag" ]; then
             echo "Failed to resolve tag." >&2
@@ -203,7 +207,11 @@ jobs:
         run: |
           tag="${{ needs.resolve-release-context.outputs.tag }}"
           if [ "$tag" = "nightly" ]; then
-            short_sha="$(git rev-parse --short=8 HEAD)"
+            if ! short_sha="$(git rev-parse --short=8 HEAD 2>/tmp/git_rev_parse_error.log)"; then
+              echo "Failed to resolve HEAD short SHA for nightly title." >&2
+              cat /tmp/git_rev_parse_error.log >&2 || true
+              exit 1
+            fi
             base_version="$(git tag --list 'v*' --sort=-version:refname | grep -E '^v[0-9]+(\.[0-9]+)*$' | head -n1)"
             if [ -z "$base_version" ]; then
               base_version="v0.0.0"
@@ -222,7 +230,11 @@ jobs:
           GH_TOKEN: ${{ github.token }}
         shell: bash
         run: |
-          current_sha="$(git rev-parse HEAD)"
+          if ! current_sha="$(git rev-parse HEAD 2>/tmp/git_rev_parse_error.log)"; then
+            echo "Failed to resolve HEAD SHA before updating nightly tag." >&2
+            cat /tmp/git_rev_parse_error.log >&2 || true
+            exit 1
+          fi
           git tag -f nightly "${current_sha}"
           git push --force origin refs/tags/nightly
 

astrbot/core/updator.py

@@ -147,8 +147,8 @@ async def check_update(
             consider_prerelease,
         )
 
-    async def get_releases(self, latest: bool = True) -> list:
-        return await self.fetch_release_info(self.ASTRBOT_RELEASE_API, latest)
+    async def get_releases(self) -> list:
+        return await self.fetch_release_info(self.ASTRBOT_RELEASE_API)
 
     @staticmethod
     def _is_expected_nightly_fetch_error(exc: BaseException) -> bool:
@@ -185,8 +185,8 @@ async def get_nightly_release(self) -> dict | None:
             return None
         return nightly_releases[0]
 
-    async def get_releases_with_nightly(self, latest: bool = True) -> list:
-        releases = await self.get_releases(latest=latest)
+    async def get_releases_with_nightly(self) -> list:
+        releases = await self.get_releases()
         nightly_release = await self.get_nightly_release()
         if nightly_release and all(
             item.get("tag_name") != self.NIGHTLY_TAG for item in releases
@@ -195,7 +195,7 @@ async def get_releases_with_nightly(self, latest: bool = True) -> list:
         return releases
 
     async def _resolve_latest_target(self) -> tuple[str, str]:
-        releases = await self.get_releases(latest=True)
+        releases = await self.get_releases()
         latest_release = next(
             (
                 item
@@ -218,7 +218,7 @@ def _resolve_nightly_target(self) -> tuple[str, str]:
         )
 
     async def _resolve_tag_target(self, version_str: str) -> tuple[str, str]:
-        releases = await self.get_releases(latest=False)
+        releases = await self.get_releases()
         for data in releases:
             if data["tag_name"] == version_str:
                 return version_str, data["zipball_url"]

astrbot/core/zip_updator.py

@@ -48,7 +48,7 @@ def __init__(self, repo_mirror: str = "") -> None:
         self.repo_mirror = repo_mirror
         self.rm_on_error = on_error
 
-    async def fetch_release_info(self, url: str, latest: bool = True) -> list:
+    async def fetch_release_info(self, url: str) -> list:
         """请求版本信息。
         返回一个列表，每个元素是一个字典，包含版本号、发布时间、更新内容、commit hash等信息。
         """
@@ -84,10 +84,6 @@ async def fetch_release_info(self, url: str, latest: bool = True) -> list:
             result = [result]
         if not result:
             return []
-        # if latest:
-        #     ret = self.github_api_release_parser([result[0]])
-        # else:
-        #     ret = self.github_api_release_parser(result)
         ret = []
         for release in result:
             ret.append(
@@ -101,23 +97,6 @@ async def fetch_release_info(self, url: str, latest: bool = True) -> list:
             )
         return ret
 
-    def github_api_release_parser(self, releases: list) -> list:
-        """解析 GitHub API 返回的 releases 信息。
-        返回一个列表，每个元素是一个字典，包含版本号、发布时间、更新内容、commit hash等信息。
-        """
-        ret = []
-        for release in releases:
-            ret.append(
-                {
-                    "version": release["name"],
-                    "published_at": release["published_at"],
-                    "body": release["body"],
-                    "tag_name": release["tag_name"],
-                    "zipball_url": release["zipball_url"],
-                },
-            )
-        return ret
-
     def unzip(self) -> NoReturn:
         raise NotImplementedError
 

scripts/release/generate_nightly_release_notes.py

@@ -9,12 +9,18 @@
 
 
 def _run_git(*args: str) -> str:
-    result = subprocess.run(
-        ["git", *args],
-        capture_output=True,
-        text=True,
-        check=True,
-    )
+    try:
+        result = subprocess.run(
+            ["git", *args],
+            capture_output=True,
+            text=True,
+            check=True,
+        )
+    except subprocess.CalledProcessError as e:
+        stderr = (e.stderr or "").strip()
+        stdout = (e.stdout or "").strip()
+        detail = stderr or stdout or "no output"
+        raise RuntimeError(f"git {' '.join(args)} failed: {detail}") from e
     return result.stdout.strip()
 
 
@@ -59,14 +65,14 @@ def generate_notes(base_tag: str, repo: str, output_path: Path) -> None:
         _write_fallback(output_path)
         return
 
-    result = subprocess.run(
-        ["git", "log", "--no-merges", "--pretty=format:%h%x1f%s", f"{base_tag}..HEAD"],
-        capture_output=True,
-        text=True,
-        check=True,
+    log_output = _run_git(
+        "log",
+        "--no-merges",
+        "--pretty=format:%h%x1f%s",
+        f"{base_tag}..HEAD",
     )
     sections: dict[str, list[str]] = defaultdict(list)
-    for line in result.stdout.splitlines():
+    for line in log_output.splitlines():
         if not line.strip() or "\x1f" not in line:
             continue
         short_sha, subject = line.split("\x1f", 1)
@@ -98,7 +104,10 @@ def main() -> None:
     parser.add_argument("--output", required=True, help="Output markdown path.")
     args = parser.parse_args()
 
-    generate_notes(args.base_tag.strip(), args.repo.strip(), Path(args.output))
+    try:
+        generate_notes(args.base_tag.strip(), args.repo.strip(), Path(args.output))
+    except Exception as e:
+        raise SystemExit(f"Failed to generate nightly release notes: {e}") from e
 
 
 if __name__ == "__main__":

tests/unit/test_updator.py

@@ -54,8 +54,7 @@ async def test_get_releases_includes_nightly_tag(monkeypatch):
         "zipball_url": "https://example.com/nightly.zip",
     }
 
-    async def mock_fetch_release_info(url: str, latest: bool = True):
-        _ = latest
+    async def mock_fetch_release_info(url: str):
         if url == updator.ASTRBOT_RELEASE_API:
             return [stable_release]
         if url == f"{updator.GITHUB_RELEASE_API}/tags/{updator.NIGHTLY_TAG}":
@@ -89,8 +88,7 @@ async def test_get_releases_deduplicates_nightly_when_already_in_stable(monkeypa
         "zipball_url": "https://example.com/github-nightly.zip",
     }
 
-    async def mock_fetch_release_info(url: str, latest: bool = True):
-        _ = latest
+    async def mock_fetch_release_info(url: str):
         if url == updator.ASTRBOT_RELEASE_API:
             return [stable_nightly_release]
         if url == f"{updator.GITHUB_RELEASE_API}/tags/{updator.NIGHTLY_TAG}":
@@ -117,15 +115,14 @@ async def test_get_releases_returns_stable_only(monkeypatch):
         "zipball_url": "https://example.com/stable.zip",
     }
 
-    async def mock_fetch_release_info(url: str, latest: bool = True):
-        _ = latest
+    async def mock_fetch_release_info(url: str):
         if url == updator.ASTRBOT_RELEASE_API:
             return [stable_release]
         raise AssertionError(f"unexpected URL: {url}")
 
     monkeypatch.setattr(updator, "fetch_release_info", mock_fetch_release_info)
 
-    releases = await updator.get_releases(latest=True)
+    releases = await updator.get_releases()
     assert len(releases) == 1
     assert releases[0]["tag_name"] == "v9.9.9"
 
@@ -134,8 +131,8 @@ async def mock_fetch_release_info(url: str, latest: bool = True):
 async def test_get_nightly_release_returns_none_for_expected_fetch_error(monkeypatch):
     updator = AstrBotUpdator()
 
-    async def mock_fetch_release_info(url: str, latest: bool = True):
-        _ = url, latest
+    async def mock_fetch_release_info(url: str):
+        _ = url
         raise FetchReleaseError("请求失败，状态码: 404")
 
     monkeypatch.setattr(updator, "fetch_release_info", mock_fetch_release_info)
@@ -148,8 +145,8 @@ async def mock_fetch_release_info(url: str, latest: bool = True):
 async def test_get_nightly_release_raises_for_unexpected_error(monkeypatch):
     updator = AstrBotUpdator()
 
-    async def mock_fetch_release_info(url: str, latest: bool = True):
-        _ = url, latest
+    async def mock_fetch_release_info(url: str):
+        _ = url
         raise KeyError("unexpected")
 
     monkeypatch.setattr(updator, "fetch_release_info", mock_fetch_release_info)
@@ -162,8 +159,8 @@ async def mock_fetch_release_info(url: str, latest: bool = True):
 async def test_check_update_skips_nightly_when_prerelease_disabled(monkeypatch):
     updator = RepoZipUpdator()
 
-    async def mock_fetch_release_info(url: str, latest: bool = True):
-        _ = url, latest
+    async def mock_fetch_release_info(url: str):
+        _ = url
         return [
             {
                 "version": "nightly",
@@ -197,8 +194,8 @@ async def mock_fetch_release_info(url: str, latest: bool = True):
 async def test_check_update_returns_none_when_only_prerelease_and_disabled(monkeypatch):
     updator = RepoZipUpdator()
 
-    async def mock_fetch_release_info(url: str, latest: bool = True):
-        _ = url, latest
+    async def mock_fetch_release_info(url: str):
+        _ = url
         return [
             {
                 "version": "nightly",