diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml index 0446760..cd8d1a9 100644 --- a/.github/workflows/docker-build.yml +++ b/.github/workflows/docker-build.yml @@ -42,6 +42,16 @@ jobs: type=sha,prefix= type=raw,value=latest,enable={{is_default_branch}} + - name: Resolve app version + id: app-version + shell: bash + run: | + if [[ "$GITHUB_REF" == refs/tags/v* ]]; then + echo "version=${GITHUB_REF_NAME#v}" >> "$GITHUB_OUTPUT" + else + echo "version=" >> "$GITHUB_OUTPUT" + fi + - name: Build and Push Docker Image uses: docker/build-push-action@v6 with: @@ -50,6 +60,8 @@ jobs: push: true tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} + build-args: | + VITE_APP_VERSION=${{ steps.app-version.outputs.version }} cache-from: type=gha cache-to: type=gha,mode=max platforms: linux/amd64,linux/arm64 diff --git a/BillNote_frontend/Dockerfile b/BillNote_frontend/Dockerfile index 9e54ab9..da5637c 100644 --- a/BillNote_frontend/Dockerfile +++ b/BillNote_frontend/Dockerfile @@ -5,6 +5,10 @@ ARG BASE_REGISTRY=docker.io FROM ${BASE_REGISTRY}/library/node:20-alpine AS builder +# 可由发布 workflow 从 git tag 注入,用于前端 About 页展示版本;未传时由 Vite 回退读取 tauri.conf.json。 +ARG VITE_APP_VERSION= +ENV VITE_APP_VERSION=${VITE_APP_VERSION} + # pnpm pin 到 9.x:lockfile 是 v9 生成;pnpm 11 要求 Node 22+ 与 node:20 不兼容 RUN corepack enable && corepack prepare pnpm@9.15.0 --activate diff --git a/BillNote_frontend/src/pages/SettingPage/about.tsx b/BillNote_frontend/src/pages/SettingPage/about.tsx index 203e5aa..25b69ed 100644 --- a/BillNote_frontend/src/pages/SettingPage/about.tsx +++ b/BillNote_frontend/src/pages/SettingPage/about.tsx @@ -8,6 +8,7 @@ import logo from '@/assets/icon.svg' import wechatQr from '@/assets/wechat.png' export default function AboutPage() { + const appVersion = __APP_VERSION__ const images = [ 'https://common-1304618721.cos.ap-chengdu.myqcloud.com/20250504102850.png', 'https://common-1304618721.cos.ap-chengdu.myqcloud.com/20250504103028.png', @@ -27,7 +28,7 @@ export default function AboutPage() { height={50} className="rounded-lg" /> -
AI 视频笔记生成工具 让 AI 为你的视频做笔记
diff --git a/BillNote_frontend/src/vite-env.d.ts b/BillNote_frontend/src/vite-env.d.ts
index 11f02fe..54eaa07 100644
--- a/BillNote_frontend/src/vite-env.d.ts
+++ b/BillNote_frontend/src/vite-env.d.ts
@@ -1 +1,3 @@
///