Merge pull request #22 from zouyonghe/main

fix: stabilize desktop exit flow and refine CI release/version sync

Author: zouyonghe

.github/workflows/build-desktop-tauri.yml

@@ -15,7 +15,7 @@ on:
         description: Publish GitHub Release after successful builds
         required: false
         type: boolean
-        default: false
+        default: true
   schedule:
     - cron: '0 * * * *'
 
@@ -192,7 +192,7 @@ jobs:
     needs:
       - resolve_build_context
       - sync_repo_version
-    if: ${{ needs.resolve_build_context.outputs.should_build == 'true' && (needs.sync_repo_version.result == 'success' || needs.sync_repo_version.result == 'skipped') }}
+    if: ${{ always() && needs.resolve_build_context.outputs.should_build == 'true' && (needs.sync_repo_version.result == 'success' || needs.sync_repo_version.result == 'skipped') }}
     name: linux-${{ matrix.arch }}
     runs-on: ${{ matrix.runner }}
     strategy:
@@ -243,7 +243,7 @@ jobs:
     needs:
       - resolve_build_context
       - sync_repo_version
-    if: ${{ needs.resolve_build_context.outputs.should_build == 'true' && (needs.sync_repo_version.result == 'success' || needs.sync_repo_version.result == 'skipped') }}
+    if: ${{ always() && needs.resolve_build_context.outputs.should_build == 'true' && (needs.sync_repo_version.result == 'success' || needs.sync_repo_version.result == 'skipped') }}
     name: macos-${{ matrix.arch }}
     runs-on: ${{ matrix.runner }}
     strategy:
@@ -414,7 +414,7 @@ jobs:
     needs:
       - resolve_build_context
       - sync_repo_version
-    if: ${{ needs.resolve_build_context.outputs.should_build == 'true' && (needs.sync_repo_version.result == 'success' || needs.sync_repo_version.result == 'skipped') }}
+    if: ${{ always() && needs.resolve_build_context.outputs.should_build == 'true' && (needs.sync_repo_version.result == 'success' || needs.sync_repo_version.result == 'skipped') }}
     name: windows-${{ matrix.arch }}
     runs-on: ${{ matrix.runner }}
     env:

Makefile

@@ -73,6 +73,14 @@ dev:
 	pnpm run dev
 
 build:
+	@set -e; \
+	build_version="$(ASTRBOT_DESKTOP_VERSION)"; \
+	if [ -z "$$build_version" ]; then \
+		build_version="$$(node -e "console.log(require('./package.json').version)")"; \
+	fi; \
+	ASTRBOT_SOURCE_GIT_URL="$(ASTRBOT_SOURCE_GIT_URL)" \
+	ASTRBOT_SOURCE_GIT_REF="$(ASTRBOT_SOURCE_GIT_REF)" \
+	ASTRBOT_DESKTOP_VERSION="$$build_version" \
 	pnpm run build
 
 rebuild: clean build

README.md

@@ -140,6 +140,8 @@ make prune
 
 推荐日常使用 `make update`，避免本地切换分支导致版本漂移。
 
+补充：`make build` 会默认使用当前 `package.json` 中的版本作为 `ASTRBOT_DESKTOP_VERSION`，避免构建前资源准备阶段把版本回写到其他值。若需覆盖，可显式传入 `ASTRBOT_DESKTOP_VERSION=...`。
+
 示例：
 
 ```bash