4v5u09Z5a4Yuc/iOSBuildServer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: master 沿用 release 轨道名，develop 用 develop，feature 用 feature

Browse Source 
上一版把 master 的轨道也改名成 master，会把历史构建号搬到新键上。
改为 master/main 继续用现有的 release 轨（build_map 原地保留），
只有 develop 等其它上架分支新建以分支名命名的轨道并复制一份构建号。

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01BJaZ913U5GVdTkYHiRpvDU
This commit is contained in:
shenlei
2026-09-02 10:39:52 +09:00
co-authored by Claude Opus 5
parent bf7a5a0449
commit 9b4667cab5
8 changed files with 64 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/test_api_config.py
+20 -18
View File
@@ -229,20 +229,21 @@ def test_update_versions_rejects_invalid_app_version(client, tmp_config):
def test_versions_tracks_are_independent(client, tmp_config):
# 每个上架分支一条轨道（轨道名即分支名），App_Ver 各自独立，互不影响
assert client.put("/api/config/versions", json={"track": "main", "app_ver": "2.196.0"}).status_code == 200
# 每个上架分支一条轨道（main/master 为 release，其余即分支名），App_Ver 各自独立
assert client.put("/api/config/versions", json={"track": "release", "app_ver": "2.196.0"}).status_code == 200
assert client.put("/api/config/versions", json={"track": "dev", "app_ver": "2.198.0"}).status_code == 200
assert client.put("/api/config/versions", json={"track": "feature", "app_ver": "2.100.0"}).status_code == 200
data = client.get("/api/config/versions").json()
assert data["tracks"]["main"]["app_ver"] == "2.196.0"
assert data["branch_track"] == {"main": "release", "dev": "dev"}
assert data["tracks"]["release"]["app_ver"] == "2.196.0"
assert data["tracks"]["dev"]["app_ver"] == "2.198.0"
assert data["tracks"]["feature"]["app_ver"] == "2.100.0"
assert data["tracks"]["feature"]["build_ver"] == "2.100.0.0"
assert data["tracks"]["main"]["kind"] == "release"
assert data["tracks"]["release"]["kind"] == "release"
assert data["tracks"]["feature"]["kind"] == "feature"
# 顶层字段镜像主上架轨（第一个上架分支），兼容旧客户端
assert data["primary_track"] == "main"
assert data["primary_track"] == "release"
assert data["app_ver"] == "2.196.0"
@@ -261,9 +262,10 @@ def test_legacy_versions_split_per_release_branch(client, tmp_config):
json.dump(cfg, f)
data = client.get("/api/config/versions").json()
for branch in ("main", "dev"):
assert data["branch_track"][branch] == branch
assert data["tracks"][branch] == {
# main 留在 release 轨，dev 拆出自己的轨，两者都带着原来的已用构建号
assert data["branch_track"] == {"main": "release", "dev": "dev"}
for track in ("release", "dev"):
assert data["tracks"][track] == {
"kind": "release",
"app_ver": "2.195.0",
"build_ver": "2.195.0.7",
@@ -272,15 +274,15 @@ def test_legacy_versions_split_per_release_branch(client, tmp_config):
# feature 轨以同一 App_Ver 初始化，构建号从 .0 起
assert data["tracks"]["feature"]["app_ver"] == "2.195.0"
assert data["tracks"]["feature"]["build_ver"] == "2.195.0.0"
# 拆分后各轨独立：改 main 不影响 dev
assert client.put("/api/config/versions", json={"track": "main", "app_ver": "2.196.0"}).status_code == 200
# 拆分后各轨独立：改 release 不影响 dev
assert client.put("/api/config/versions", json={"track": "release", "app_ver": "2.196.0"}).status_code == 200
data = client.get("/api/config/versions").json()
assert data["tracks"]["main"]["app_ver"] == "2.196.0"
assert data["tracks"]["release"]["app_ver"] == "2.196.0"
assert data["tracks"]["dev"]["app_ver"] == "2.195.0"
def test_legacy_shared_release_track_splits_per_branch(client, tmp_config):
"""旧的 master/develop 共用 release 轨：拆成各分支自己的轨，构建号原样带过去"""
"""旧的 master/develop 共用 release 轨：master 留在 release 轨，其余分支拆出自己的轨"""
import json
with open(tmp_config, "r", encoding="utf-8") as f:
cfg = json.load(f)
@@ -293,11 +295,11 @@ def test_legacy_shared_release_track_splits_per_branch(client, tmp_config):
json.dump(cfg, f)
data = client.get("/api/config/versions").json()
assert "release" not in data["tracks"]
assert data["branch_track"] == {"main": "main", "dev": "dev"}
for branch in ("main", "dev"):
assert data["tracks"][branch]["app_ver"] == "2.195.0"
assert data["tracks"][branch]["build_ver"] == "2.195.0.4"
assert data["branch_track"] == {"main": "release", "dev": "dev"}
for track in ("release", "dev"):
assert data["tracks"][track]["kind"] == "release"
assert data["tracks"][track]["app_ver"] == "2.195.0"
assert data["tracks"][track]["build_ver"] == "2.195.0.4"
assert data["tracks"]["feature"]["app_ver"] == "2.100.0"
@@ -306,7 +308,7 @@ def test_branch_track_defaults_and_override(client, tmp_config):
assert client.post("/api/config/branches", json={"name": "feature/login"}).status_code == 200
data = client.get("/api/config/versions").json()
# 上架分支各有一条以分支名命名的轨道，自测分支共用 feature 轨
# 上架分支各有一条独立轨道（main/master 为 release，其余即分支名），自测分支共用 feature 轨
assert data["branch_track"]["develop"] == "develop"
assert data["branch_track"]["feature/login"] == "feature"
assert data["tracks"]["develop"]["kind"] == "release"
tests/test_build_service.py
+9 -9
View File
@@ -344,7 +344,7 @@ async def test_generate_config_uses_saved_version(tmp_path, log_streamer):
task.obfuscation = False
task.branch = "master"
mock_config = _versions_config({"master": _release("3.0.1"), "feature": _feature("9.9.9")})
mock_config = _versions_config({"release": _release("3.0.1"), "feature": _feature("9.9.9")})
with patch("backend.routers.config.load_config", return_value=mock_config):
result = await generate_config("t1", task, build_dir)
@@ -363,7 +363,7 @@ async def test_generate_config_appstore_increments_per_version(tmp_path, log_str
# 2.195.0 已打到 .5，切到 2.196.0 后又回退到 2.195.0
mock_config = _versions_config({
"master": _release("2.195.0", {"2.195.0": 5, "2.196.0": 3}),
"release": _release("2.195.0", {"2.195.0": 5, "2.196.0": 3}),
"feature": _feature("2.195.0"),
})
@@ -372,7 +372,7 @@ async def test_generate_config_appstore_increments_per_version(tmp_path, log_str
result = await generate_config("t1", task, build_dir)
# 从 2.195.0 自身的 5 继续到 6，不受 2.196.0 影响，也不撞已传的 .5
release_map = mock_config["versions"]["tracks"]["master"]["build_map"]
release_map = mock_config["versions"]["tracks"]["release"]["build_map"]
assert result["BUILD_VERSION"] == "2.195.0.6"
assert release_map["2.195.0"] == 6
assert release_map["2.196.0"] == 3
@@ -388,7 +388,7 @@ async def test_generate_config_release_branches_are_independent(tmp_path, log_st
obfuscation=False, branch="develop")
mock_config = _versions_config({
"master": _release("2.195.0", {"2.195.0": 5}),
"release": _release("2.195.0", {"2.195.0": 5}), # master
"develop": _release("2.196.0", {"2.196.0": 1}),
"feature": _feature("2.100.0"),
})
@@ -399,8 +399,8 @@ async def test_generate_config_release_branches_are_independent(tmp_path, log_st
assert result["VERSION"] == "2.196.0"
assert result["BUILD_VERSION"] == "2.196.0.2"
# master 轨完全不受影响
assert mock_config["versions"]["tracks"]["master"]["build_map"] == {"2.195.0": 5}
# master 的 release 轨完全不受影响
assert mock_config["versions"]["tracks"]["release"]["build_map"] == {"2.195.0": 5}
async def test_generate_config_build_no_skips_other_release_track(tmp_path, log_streamer):
@@ -412,7 +412,7 @@ async def test_generate_config_build_no_skips_other_release_track(tmp_path, log_
obfuscation=False, branch="develop")
mock_config = _versions_config({
"master": _release("2.196.0", {"2.196.0": 7}),
"release": _release("2.196.0", {"2.196.0": 7}), # master
"develop": _release("2.196.0", {"2.196.0": 2}),
"feature": _feature("2.100.0"),
})
@@ -434,7 +434,7 @@ async def test_generate_config_feature_branch_never_increments(tmp_path, log_str
obfuscation=False, branch="feature/login")
mock_config = _versions_config({
"master": _release("2.195.0", {"2.195.0": 5}),
"release": _release("2.195.0", {"2.195.0": 5}),
"feature": _feature("2.100.0"),
})
@@ -457,7 +457,7 @@ async def test_generate_config_branch_track_override(tmp_path, log_streamer):
obfuscation=False, branch="release/2.196")
mock_config = _versions_config({
"master": _release("2.196.0"),
"release": _release("2.196.0"),
"feature": _feature("2.100.0"),
})
mock_config["branch_track"] = {"release/2.196": "feature"}