diff --git a/backend/package/pyproject.toml b/backend/package/pyproject.toml index 2fd4086b..eec935d4 100644 --- a/backend/package/pyproject.toml +++ b/backend/package/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [project] name = "yuxi" -version = "0.6.2" +version = "0.6.2.dev1" description = "Yuxi 智能知识库与知识图谱平台核心后端包" readme = "README.md" requires-python = ">=3.12,<3.14" diff --git a/backend/pyproject.toml b/backend/pyproject.toml index 38f29ed0..6ae5bf01 100644 --- a/backend/pyproject.toml +++ b/backend/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "yuxi-workspace" -version = "0.6.2" +version = "0.6.2.dev1" description = "基于大模型的智能知识库与知识图谱智能体开发平台,融合了 RAG 技术与知识图谱技术,基于 LangGraph v1 + Vue.js + FastAPI + LightRAG 架构构建" readme = "README.md" requires-python = ">=3.12,<3.14" diff --git a/backend/uv.lock b/backend/uv.lock index 824fd35e..eda65397 100644 --- a/backend/uv.lock +++ b/backend/uv.lock @@ -5659,7 +5659,7 @@ wheels = [ [[package]] name = "yuxi" -version = "0.6.2" +version = "0.6.2.dev1" source = { editable = "package" } dependencies = [ { name = "agent-sandbox" }, @@ -5816,7 +5816,7 @@ requires-dist = [ [[package]] name = "yuxi-workspace" -version = "0.6.2" +version = "0.6.2.dev1" source = { virtual = "." } dependencies = [ { name = "arq" }, diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml index e8f6929c..4621e985 100644 --- a/docker-compose.prod.yml +++ b/docker-compose.prod.yml @@ -32,7 +32,7 @@ services: build: context: . dockerfile: docker/api.Dockerfile - image: yuxi-api:${YUXI_VERSION:-0.6.2} + image: yuxi-api:${YUXI_VERSION:-0.6.2.dev1} container_name: api-prod working_dir: /app networks: @@ -69,7 +69,7 @@ services: build: context: . dockerfile: docker/api.Dockerfile - image: yuxi-api:${YUXI_VERSION:-0.6.2} + image: yuxi-api:${YUXI_VERSION:-0.6.2.dev1} container_name: worker-prod working_dir: /app networks: @@ -145,7 +145,7 @@ services: context: . dockerfile: docker/web.Dockerfile target: production - image: yuxi-web:${YUXI_VERSION:-0.6.2} + image: yuxi-web:${YUXI_VERSION:-0.6.2.dev1} container_name: web-prod ports: - "80:80" diff --git a/docker-compose.yml b/docker-compose.yml index d9b14589..45cd2a88 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -40,7 +40,7 @@ services: build: context: . dockerfile: docker/api.Dockerfile - image: yuxi-api:${YUXI_VERSION:-0.6.2} + image: yuxi-api:${YUXI_VERSION:-0.6.2.dev1} container_name: api-dev working_dir: /app volumes: @@ -88,7 +88,7 @@ services: build: context: . dockerfile: docker/api.Dockerfile - image: yuxi-api:${YUXI_VERSION:-0.6.2} + image: yuxi-api:${YUXI_VERSION:-0.6.2.dev1} container_name: worker-dev working_dir: /app volumes: @@ -127,7 +127,7 @@ services: build: context: ./docker/sandbox_provisioner dockerfile: Dockerfile - image: yuxi-sandbox-provisioner:${YUXI_VERSION:-0.6.2} + image: yuxi-sandbox-provisioner:${YUXI_VERSION:-0.6.2.dev1} container_name: sandbox-provisioner volumes: - ./saves:/app/saves @@ -181,7 +181,7 @@ services: context: . dockerfile: docker/web.Dockerfile target: development - image: yuxi-web:${YUXI_VERSION:-0.6.2} + image: yuxi-web:${YUXI_VERSION:-0.6.2.dev1} container_name: web-dev volumes: - ./web/src:/app/src diff --git a/scripts/bump-version.sh b/scripts/bump-version.sh index ce528c5f..e8afea1c 100755 --- a/scripts/bump-version.sh +++ b/scripts/bump-version.sh @@ -4,20 +4,29 @@ set -euo pipefail # ============================================================================= # Yuxi 版本号升级脚本 # ============================================================================= -# 用法: ./scripts/bump-version.sh <新版本号> +# 用法: ./scripts/bump-version.sh [--dev] <新版本号> # 示例: ./scripts/bump-version.sh 0.6.2 +# 示例: ./scripts/bump-version.sh --dev 0.6.2.dev1 # # 该脚本从 backend/package/pyproject.toml 读取当前版本, # 自动同步所有需要硬编码版本号的位置。 +# --dev 模式不会更新 README.md 和 docs/intro/quick-start.md 中 git clone --branch 的版本号。 # ============================================================================= SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" PROJECT_ROOT="$(cd "${SCRIPT_DIR}/.." && pwd)" # 检查参数 +DEV_MODE=false +if [ "${1:-}" = "--dev" ]; then + DEV_MODE=true + shift +fi + if [ $# -ne 1 ]; then - echo "用法: $0 <新版本号>" + echo "用法: $0 [--dev] <新版本号>" echo "示例: $0 0.6.2" + echo "示例: $0 --dev 0.6.2.dev1" exit 1 fi @@ -56,8 +65,10 @@ echo " - web/package.json" echo " - docker-compose.yml" echo " - docker-compose.prod.yml" echo " - backend/uv.lock" -echo " - README.md" -echo " - docs/intro/quick-start.md" +if [ "$DEV_MODE" = false ]; then + echo " - README.md" + echo " - docs/intro/quick-start.md" +fi echo "" read -rp "确认继续? [y/N] " confirm if [[ ! "$confirm" =~ ^[Yy]$ ]]; then @@ -113,13 +124,17 @@ sed -i -E "/^name = \"yuxi-workspace\"$/{n;s/^version = \"[^\"]+\"/version = \"$ # ----------------------------------------------------------------------------- # 只替换 git clone 命令中的版本标签(确保总是指向最新版本) # 发布历史记录(如 [2026/04/01] v0.6.1 版本发布)不修改,保持为历史版本记录 -echo "→ 更新 README.md" -sed -i -E "s/(git clone --branch v)[0-9]+\.[0-9]+\.[0-9]+/\1${NEW_VERSION}/g" \ - "${PROJECT_ROOT}/README.md" +if [ "$DEV_MODE" = false ]; then + echo "→ 更新 README.md" + sed -i -E "s/(git clone --branch v)[0-9]+\.[0-9]+\.[0-9]+/\1${NEW_VERSION}/g" \ + "${PROJECT_ROOT}/README.md" -echo "→ 更新 docs/intro/quick-start.md" -sed -i -E "s/(git clone --branch v)[0-9]+\.[0-9]+\.[0-9]+/\1${NEW_VERSION}/g" \ - "${PROJECT_ROOT}/docs/intro/quick-start.md" + echo "→ 更新 docs/intro/quick-start.md" + sed -i -E "s/(git clone --branch v)[0-9]+\.[0-9]+\.[0-9]+/\1${NEW_VERSION}/g" \ + "${PROJECT_ROOT}/docs/intro/quick-start.md" +else + echo "→ dev 模式,跳过 README.md 和 docs/intro/quick-start.md 的分支版本更新" +fi # ----------------------------------------------------------------------------- # 7. 验证 @@ -146,7 +161,6 @@ grep -E "image: yuxi-web:" "${PROJECT_ROOT}/docker-compose.prod.yml" | head -1 | echo "" echo "后续步骤:" echo " 1. 检查 git diff 确认修改无误" -echo " 2. 基于 [Roadmap](docs/develop-guides/roadmap.md) 整理后,更新到 docs/develop-guides/changelog.md" -echo " 3. git add . && git commit -m 'chore(release): bump version to ${NEW_VERSION}'" -echo " 4. git tag v${NEW_VERSION}" -echo " 5. git push origin main --tags" +echo " 2. git add . && git commit -m 'chore(release): bump version to ${NEW_VERSION}'" +echo " 3. git tag v${NEW_VERSION}" +echo " 4. git push origin main --tags" diff --git a/web/package.json b/web/package.json index 1e6f84ca..0d3dd9fc 100644 --- a/web/package.json +++ b/web/package.json @@ -1,6 +1,6 @@ { "name": "yuxi-web", - "version": "0.6.2", + "version": "0.6.2.dev1", "private": true, "type": "module", "scripts": {