refactor: harden prerelease handling and nightly constants

zouyonghe · zouyonghe · commit 8d23e19e9d77 · 2026-03-04T23:46:44.000+09:00
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -20,6 +20,9 @@ on:
 permissions:
   contents: write
 
+env:
+  NIGHTLY_TAG: nightly
+
 jobs:
   resolve-release-context:
     name: Resolve Release Context
@@ -44,7 +47,7 @@ jobs:
             default_branch="master"
           fi
 
-          if [ "$event_name" = "schedule" ] || { [ "$event_name" = "workflow_dispatch" ] && [ "$input_tag" = "nightly" ]; }; then
+          if [ "$event_name" = "schedule" ] || { [ "$event_name" = "workflow_dispatch" ] && [ "$input_tag" = "$NIGHTLY_TAG" ]; }; then
             ref="refs/heads/${default_branch}"
           elif [ -n "$input_ref" ]; then
             ref="$input_ref"
@@ -71,7 +74,7 @@ jobs:
           fi
 
           if [ "$event_name" = "schedule" ]; then
-            tag="nightly"
+            tag="$NIGHTLY_TAG"
           elif [ "$event_name" = "push" ]; then
             tag="${GITHUB_REF_NAME}"
           elif [ -n "$dispatch_tag" ]; then
@@ -159,7 +162,7 @@ jobs:
           path: dashboard/AstrBot-${{ needs.resolve-release-context.outputs.tag }}-dashboard.zip
 
       - name: Upload dashboard package to Cloudflare R2
-        if: ${{ env.R2_ACCOUNT_ID != '' && env.R2_ACCESS_KEY_ID != '' && env.R2_SECRET_ACCESS_KEY != '' && needs.resolve-release-context.outputs.tag != 'nightly' }}
+        if: ${{ env.R2_ACCOUNT_ID != '' && env.R2_ACCESS_KEY_ID != '' && env.R2_SECRET_ACCESS_KEY != '' && needs.resolve-release-context.outputs.tag != env.NIGHTLY_TAG }}
         env:
           R2_BUCKET_NAME: "astrbot"
           R2_OBJECT_NAME: "astrbot-webui-latest.zip"
@@ -188,8 +191,8 @@ jobs:
     name: Publish GitHub Release
     runs-on: ubuntu-24.04
     concurrency:
-      group: ${{ needs.resolve-release-context.outputs.tag == 'nightly' && 'nightly-release' || format('release-{0}', needs.resolve-release-context.outputs.tag) }}
-      cancel-in-progress: ${{ needs.resolve-release-context.outputs.tag == 'nightly' }}
+      group: ${{ needs.resolve-release-context.outputs.tag == env.NIGHTLY_TAG && 'nightly-release' || format('release-{0}', needs.resolve-release-context.outputs.tag) }}
+      cancel-in-progress: ${{ needs.resolve-release-context.outputs.tag == env.NIGHTLY_TAG }}
     needs:
       - resolve-release-context
       - verify-core
@@ -206,7 +209,7 @@ jobs:
         shell: bash
         run: |
           tag="${{ needs.resolve-release-context.outputs.tag }}"
-          if [ "$tag" = "nightly" ]; then
+          if [ "$tag" = "$NIGHTLY_TAG" ]; then
             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
@@ -216,7 +219,7 @@ jobs:
             if [ -z "$base_version" ]; then
               base_version="v0.0.0"
             fi
-            title="${base_version}-nightly-${short_sha}"
+            title="${base_version}-${NIGHTLY_TAG}-${short_sha}"
           else
             base_version="$tag"
             title="$tag"
@@ -225,7 +228,7 @@ jobs:
           echo "base_version=$base_version" >> "$GITHUB_OUTPUT"
 
       - name: Force-update nightly tag
-        if: ${{ needs.resolve-release-context.outputs.tag == 'nightly' }}
+        if: ${{ needs.resolve-release-context.outputs.tag == env.NIGHTLY_TAG }}
         env:
           GH_TOKEN: ${{ github.token }}
         shell: bash
@@ -235,8 +238,8 @@ jobs:
             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
+          git tag -f "$NIGHTLY_TAG" "${current_sha}"
+          git push --force origin "refs/tags/${NIGHTLY_TAG}"
 
       - name: Download dashboard artifact
         uses: actions/download-artifact@v8
@@ -250,7 +253,7 @@ jobs:
         shell: bash
         run: |
           tag="${{ needs.resolve-release-context.outputs.tag }}"
-          if [ "$tag" = "nightly" ]; then
+          if [ "$tag" = "$NIGHTLY_TAG" ]; then
             note_file="$(mktemp)"
             python3 scripts/release/generate_nightly_release_notes.py \
               --base-tag "${{ steps.release-meta.outputs.base_version }}" \
@@ -272,14 +275,14 @@ jobs:
         run: |
           tag="${{ needs.resolve-release-context.outputs.tag }}"
           title="${{ steps.release-meta.outputs.title }}"
-          if [ "$tag" = "nightly" ]; then
+          if [ "$tag" = "$NIGHTLY_TAG" ]; then
             pre_flag="--prerelease"
           else
             pre_flag=""
           fi
           if ! gh release view "$tag" >/dev/null 2>&1; then
             gh release create "$tag" --title "$title" --notes-file "${{ steps.notes.outputs.file }}" $pre_flag
-          elif [ "$tag" = "nightly" ]; then
+          elif [ "$tag" = "$NIGHTLY_TAG" ]; then
             gh release edit "$tag" --title "$title" --notes-file "${{ steps.notes.outputs.file }}" --prerelease
           fi
 
@@ -307,7 +310,7 @@ jobs:
 
   publish-pypi:
     name: Publish PyPI
-    if: ${{ needs.resolve-release-context.outputs.tag != 'nightly' }}
+    if: ${{ needs.resolve-release-context.outputs.tag != env.NIGHTLY_TAG }}
     runs-on: ubuntu-24.04
     needs:
       - resolve-release-context
diff --git a/astrbot/core/release_constants.py b/astrbot/core/release_constants.py
@@ -0,0 +1 @@
+NIGHTLY_TAG = "nightly"
diff --git a/astrbot/core/updator.py b/astrbot/core/updator.py
@@ -8,10 +8,16 @@
 
 from astrbot.core import logger
 from astrbot.core.config.default import VERSION
+from astrbot.core.release_constants import NIGHTLY_TAG
 from astrbot.core.utils.astrbot_path import get_astrbot_path
 from astrbot.core.utils.io import download_file
 
-from .zip_updator import FetchReleaseError, ReleaseInfo, RepoZipUpdator
+from .zip_updator import (
+    PRERELEASE_TAG_REGEX,
+    FetchReleaseError,
+    ReleaseInfo,
+    RepoZipUpdator,
+)
 
 
 class AstrBotUpdator(RepoZipUpdator):
@@ -27,7 +33,7 @@ def __init__(self, repo_mirror: str = "") -> None:
         self.GITHUB_RELEASE_API = (
             "https://api.github.com/repos/AstrBotDevs/AstrBot/releases"
         )
-        self.NIGHTLY_TAG = "nightly"
+        self.NIGHTLY_TAG = NIGHTLY_TAG
 
     def terminate_child_processes(self) -> None:
         """终止当前进程的所有子进程
@@ -200,7 +206,9 @@ async def _resolve_latest_target(self) -> tuple[str, str]:
             (
                 item
                 for item in releases
-                if item.get("tag_name", "").lower() != self.NIGHTLY_TAG
+                if (tag := item.get("tag_name", ""))
+                and tag.lower() != self.NIGHTLY_TAG
+                and not PRERELEASE_TAG_REGEX.search(tag)
             ),
             None,
         )
diff --git a/astrbot/core/zip_updator.py b/astrbot/core/zip_updator.py
@@ -10,11 +10,12 @@
 import certifi
 
 from astrbot.core import logger
+from astrbot.core.release_constants import NIGHTLY_TAG
 from astrbot.core.utils.io import download_file, on_error
 from astrbot.core.utils.version_comparator import VersionComparator
 
 PRERELEASE_TAG_REGEX = re.compile(
-    r"[\-_.]?(alpha|beta|rc|dev|nightly|pre|preview)[\-_.]?\d*$",
+    rf"[\-_.]?(alpha|beta|rc|dev|{re.escape(NIGHTLY_TAG)}|pre|preview)[\-_.]?\d*$",
     re.IGNORECASE,
 )
 # Keep this rule aligned with dashboard/src/layouts/full/vertical-header/VerticalHeader.vue.
@@ -71,21 +72,24 @@ def _normalize_release_payload(result: object, url: str) -> list:
             "zipball_url",
         )
         normalized = []
+        invalid_entry_count = 0
         for idx, release in enumerate(releases):
             if not isinstance(release, dict):
-                logger.error(
+                logger.warning(
                     f"版本信息第 {idx} 项格式异常，期望字典，实际为: {type(release).__name__}, url: {url}",
                 )
-                raise FetchReleaseError("版本信息格式异常")
+                invalid_entry_count += 1
+                continue
 
             missing_fields = [
                 field for field in required_fields if field not in release
             ]
             if missing_fields:
-                logger.error(
+                logger.warning(
                     f"版本信息第 {idx} 项缺少字段: {missing_fields}, url: {url}",
                 )
-                raise FetchReleaseError("版本信息字段缺失")
+                invalid_entry_count += 1
+                continue
 
             normalized.append(
                 {
@@ -96,6 +100,15 @@ def _normalize_release_payload(result: object, url: str) -> list:
                     "zipball_url": release["zipball_url"],
                 },
             )
+
+        if invalid_entry_count:
+            logger.warning(
+                f"版本信息存在 {invalid_entry_count} 条无效数据，已跳过，url: {url}",
+            )
+
+        if not normalized:
+            raise FetchReleaseError("版本信息全部无效")
+
         return normalized
 
     async def fetch_release_info(self, url: str) -> list:
diff --git a/scripts/release/generate_nightly_release_notes.py b/scripts/release/generate_nightly_release_notes.py
@@ -7,6 +7,8 @@
 from collections import defaultdict
 from pathlib import Path
 
+from astrbot.core.release_constants import NIGHTLY_TAG
+
 
 def _run_git(*args: str) -> str:
     try:
@@ -54,7 +56,7 @@ def _classify(subject: str) -> str:
 def _write_fallback(output_path: Path) -> None:
     short_sha = _run_git("rev-parse", "--short=8", "HEAD")
     output_path.write_text(
-        f"## What's Changed\n\n- Nightly build from `{short_sha}`\n",
+        f"## What's Changed\n\n- {NIGHTLY_TAG.capitalize()} build from `{short_sha}`\n",
         encoding="utf-8",
     )
 
@@ -85,7 +87,13 @@ def generate_notes(base_tag: str, repo: str, output_path: Path) -> None:
     with output_path.open("w", encoding="utf-8") as file:
         file.write("## What's Changed\n\n")
         file.write(f"- Baseline tag: `{base_tag}`\n")
-        file.write(f"- Nightly commit: `{nightly_commit}`\n\n")
+        file.write(f"- {NIGHTLY_TAG.capitalize()} commit: `{nightly_commit}`\n")
+
+        if not any(sections.values()):
+            file.write(f"- No changes since `{base_tag}`\n\n")
+            return
+
+        file.write("\n")
         for title in ("新增", "修复", "优化", "其他"):
             items = sections.get(title, [])
             if not items:
diff --git a/tests/unit/test_prerelease_rule_sync.py b/tests/unit/test_prerelease_rule_sync.py
@@ -1,12 +1,14 @@
-from pathlib import Path
 import re
+from pathlib import Path
 
 from astrbot.core.zip_updator import PRERELEASE_TAG_REGEX
 
 
 def test_prerelease_rule_is_synced_with_dashboard():
     repo_root = Path(__file__).resolve().parents[2]
-    vue_path = repo_root / "dashboard/src/layouts/full/vertical-header/VerticalHeader.vue"
+    vue_path = (
+        repo_root / "dashboard/src/layouts/full/vertical-header/VerticalHeader.vue"
+    )
     content = vue_path.read_text(encoding="utf-8")
 
     match = re.search(
@@ -17,3 +19,26 @@ def test_prerelease_rule_is_synced_with_dashboard():
     vue_pattern, vue_flags = match.groups()
     assert vue_pattern == PRERELEASE_TAG_REGEX.pattern
     assert ("i" in vue_flags) == bool(PRERELEASE_TAG_REGEX.flags & re.IGNORECASE)
+
+
+def test_prerelease_rule_matches_expected_examples():
+    prerelease_tags = (
+        "v1.2.3-alpha.1",
+        "v1.2.3-beta",
+        "v1.2.3-rc1",
+        "v1.2.3-dev",
+        "v1.2.3-nightly",
+        "v1.2.3-pre",
+        "v1.2.3-preview",
+    )
+    stable_tags = (
+        "v1.2.3",
+        "v1.2.3+build.1",
+        "v1.2.3-release",
+    )
+
+    for tag in prerelease_tags:
+        assert PRERELEASE_TAG_REGEX.search(tag) is not None
+
+    for tag in stable_tags:
+        assert PRERELEASE_TAG_REGEX.search(tag) is None
diff --git a/tests/unit/test_updator.py b/tests/unit/test_updator.py
