Skip to content

AI-native knowledge base & Evernote/Obsidian alternative with instant sync & native MCP. Free on Cloudflare or self-hosted via Docker.

feat: improve release version management

tianma-if03be01f0aefe
diff --git a/apps/mobile/src/lib/mobile-release.test.ts b/apps/mobile/src/lib/mobile-release.test.ts
index 43e018a2..950bc13e 100644
--- a/apps/mobile/src/lib/mobile-release.test.ts
+++ b/apps/mobile/src/lib/mobile-release.test.ts
@@ -1,7 +1,10 @@
import { expect, test } from "bun:test";
import { findNewerMobileRelease } from "./mobile-release";
-const responseWithTag = (tagName: string) => new Response(JSON.stringify({ tag_name: tagName }), {
+const responseWithTag = (tagName: string, androidVersion = tagName.replace(/^v/, "")) => new Response(JSON.stringify({
+ assets: [{ name: `edgeever-android-v${androidVersion}-arm64-v8a.apk` }],
+ tag_name: tagName,
+}), {
headers: { "Content-Type": "application/json" },
status: 200,
});
@@ -17,6 +20,13 @@ test("does not treat the current or an older release as an update", async () =>
expect(await findNewerMobileRelease("0.4.15", async () => responseWithTag("v0.4.14"))).toBeNull();
});
+test("uses the actual reused Android asset version instead of the overall release tag", async () => {
+ expect(await findNewerMobileRelease("1.6.50", async () => responseWithTag("v1.7.0", "1.6.50"))).toBeNull();
+ expect(await findNewerMobileRelease("1.6.49", async () => responseWithTag("v1.7.0", "1.6.50"))).toEqual({
+ version: "1.6.50",
+ });
+});
+
test("rejects invalid release responses instead of claiming the app is current", async () => {
await expect(findNewerMobileRelease("0.4.14", async () => responseWithTag("latest"))).rejects.toThrow(
"Invalid GitHub release version"
@@ -24,4 +34,8 @@ test("rejects invalid release responses instead of claiming the app is current",
await expect(findNewerMobileRelease("0.4.14", async () => new Response(null, { status: 403 }))).rejects.toThrow(
"status 403"
);
+ await expect(findNewerMobileRelease("0.4.14", async () => new Response(JSON.stringify({
+ assets: [],
+ tag_name: "v0.4.15",
+ })))).rejects.toThrow("exactly one Android APK");
});
diff --git a/apps/mobile/src/lib/mobile-release.ts b/apps/mobile/src/lib/mobile-release.ts
index 47210ce9..73e0703f 100644
--- a/apps/mobile/src/lib/mobile-release.ts
+++ b/apps/mobile/src/lib/mobile-release.ts
@@ -6,6 +6,7 @@ export const GITHUB_LATEST_RELEASE_URL = "https://github.com/tianma-if/edgeever/
export const GOOGLE_PLAY_URL = "https://play.google.com/store/apps/details?id=org.edgeever.mobile";
type LatestReleaseResponse = {
+ assets?: unknown;
tag_name?: unknown;
};
@@ -18,6 +19,21 @@ const normalizeVersion = (value: string) => {
return normalized && valid(normalized) ? normalized : null;
};
+const ANDROID_ASSET_PATTERN = /^edgeever-android-v(\d+\.\d+\.\d+)-arm64-v8a\.apk$/;
+
+export const findAndroidReleaseVersion = (assets: unknown) => {
+ if (!Array.isArray(assets)) return null;
+ const versions = assets
+ .map((asset) => {
+ if (!asset || typeof asset !== "object" || !("name" in asset) || typeof asset.name !== "string") {
+ return null;
+ }
+ return ANDROID_ASSET_PATTERN.exec(asset.name)?.[1] ?? null;
+ })
+ .filter((version): version is string => Boolean(version));
+ return versions.length === 1 ? versions[0] : null;
+};
+
export const findNewerMobileRelease = async (
currentVersion: string,
fetchRelease: typeof fetch = fetch
@@ -41,10 +57,14 @@ export const findNewerMobileRelease = async (
if (typeof release.tag_name !== "string") {
throw new Error("GitHub release response does not contain a version tag");
}
- const latestVersion = normalizeVersion(release.tag_name);
- if (!latestVersion) {
+ const releaseVersion = normalizeVersion(release.tag_name);
+ if (!releaseVersion) {
throw new Error(`Invalid GitHub release version: ${release.tag_name}`);
}
+ const latestVersion = findAndroidReleaseVersion(release.assets);
+ if (!latestVersion) {
+ throw new Error("GitHub release response does not contain exactly one Android APK");
+ }
return gt(latestVersion, normalizedCurrentVersion) ? { version: latestVersion } : null;
};
diff --git a/apps/web/src/components/EditorPane.tsx b/apps/web/src/components/EditorPane.tsx
index 9eda1ed8..2ffed9ae 100644
--- a/apps/web/src/components/EditorPane.tsx
+++ b/apps/web/src/components/EditorPane.tsx
@@ -1214,7 +1214,7 @@ const RichEditorPane = ({
useEffect(() => {
const controller = new AbortController();
void fetchLatestRelease(controller.signal)
- .then((release) => setUpdateAvailable(isVersionOutdated(__EDGEEVER_APP_VERSION__, release.tagName)))
+ .then((release) => setUpdateAvailable(isVersionOutdated(__EDGEEVER_APP_VERSION__, release.version)))
.catch(() => undefined);
const handleReleaseStatus = () => setUpdateAvailable(true);
window.addEventListener(RELEASE_STATUS_EVENT, handleReleaseStatus);
diff --git a/apps/web/src/components/ReleaseUpdateNotice.tsx b/apps/web/src/components/ReleaseUpdateNotice.tsx
index 6f2a7ffa..f4ac69ec 100644
--- a/apps/web/src/components/ReleaseUpdateNotice.tsx
+++ b/apps/web/src/components/ReleaseUpdateNotice.tsx
@@ -17,7 +17,7 @@ export const ReleaseUpdateNotice = () => {
const controller = new AbortController();
void fetchLatestRelease(controller.signal)
.then((latest) => {
- if (isVersionOutdated(__EDGEEVER_APP_VERSION__, latest.tagName)) setRelease(latest);
+ if (isVersionOutdated(__EDGEEVER_APP_VERSION__, latest.version)) setRelease(latest);
})
.catch(() => undefined);
return () => controller.abort();
@@ -86,7 +86,7 @@ export const ReleaseUpdateNotice = () => {
? t("systemInfo.desktopUpdateReady")
: nativeUpdateState === "error"
? t("systemInfo.desktopUpdateFailed")
- : t("systemInfo.updateAvailableDescription", { version: release?.tagName ?? "" })}
+ : t("systemInfo.updateAvailableDescription", { version: release?.version ?? "" })}
</div>
<div className="mt-2 flex flex-wrap items-center gap-3">
{isNativeUpdate && nativeUpdateState !== "downloading" && nativeUpdateState !== "error" && (
diff --git a/apps/web/src/components/settings/SystemInfoPanel.tsx b/apps/web/src/components/settings/SystemInfoPanel.tsx
index f0a282bf..7062ed30 100644
--- a/apps/web/src/components/settings/SystemInfoPanel.tsx
+++ b/apps/web/src/components/settings/SystemInfoPanel.tsx
@@ -76,7 +76,7 @@ export const SystemInfoPanel = ({ active = true }: { active?: boolean }) => {
void fetchLatestRelease(controller.signal)
.then((release) => {
setLatestRelease(release);
- setReleaseCheck(isVersionOutdated(__EDGEEVER_APP_VERSION__, release.tagName) ? "outdated" : "latest");
+ setReleaseCheck(isVersionOutdated(__EDGEEVER_APP_VERSION__, release.version) ? "outdated" : "latest");
})
.catch(() => {
if (!controller.signal.aborted) setReleaseCheck("error");
@@ -103,7 +103,7 @@ export const SystemInfoPanel = ({ active = true }: { active?: boolean }) => {
<ArrowUpCircle className="mt-0.5 h-4 w-4 shrink-0 text-emerald-600" />
<div className="min-w-0 flex-1 text-xs leading-5">
<div className="font-semibold">{t("systemInfo.updateAvailableTitle")}</div>
- <div className="text-slate-500">{t("systemInfo.updateAvailableDescription", { version: latestRelease.tagName })}</div>
+ <div className="text-slate-500">{t("systemInfo.updateAvailableDescription", { version: latestRelease.version })}</div>
</div>
<a className="inline-flex shrink-0 items-center gap-1 text-xs font-semibold text-emerald-700 underline underline-offset-2 hover:text-emerald-900" href={latestRelease.url} target="_blank" rel="noreferrer">
{t("systemInfo.viewRelease")} <ExternalLink className="h-3 w-3" />
diff --git a/apps/web/src/lib/version-check.test.mjs b/apps/web/src/lib/version-check.test.mjs
new file mode 100644
index 00000000..bb6993c1
--- /dev/null
+++ b/apps/web/src/lib/version-check.test.mjs
@@ -0,0 +1,25 @@
+import { describe, expect, test } from "bun:test";
+import { findDesktopReleaseVersion, isVersionOutdated } from "./version-check";
+
+describe("platform release version checks", () => {
+ test("derives the installed desktop version from the DMG asset", () => {
+ expect(findDesktopReleaseVersion([
+ "EdgeEver-1.6.50-mac-arm64.dmg",
+ "EdgeEver-1.6.50-mac-arm64.dmg.blockmap",
+ "edgeever-android-v1.6.49-arm64-v8a.apk",
+ ])).toBe("1.6.50");
+ });
+
+ test("rejects missing or ambiguous desktop assets", () => {
+ expect(findDesktopReleaseVersion([])).toBeNull();
+ expect(findDesktopReleaseVersion([
+ "EdgeEver-1.6.49-mac-arm64.dmg",
+ "EdgeEver-1.6.50-mac-arm64.dmg",
+ ])).toBeNull();
+ });
+
+ test("compares semantic release components and ignores build metadata", () => {
+ expect(isVersionOutdated("1.6.49+12", "1.6.50")).toBe(true);
+ expect(isVersionOutdated("1.6.50+3", "1.6.50")).toBe(false);
+ });
+});
diff --git a/apps/web/src/lib/version-check.ts b/apps/web/src/lib/version-check.ts
index b044e397..df88829e 100644
--- a/apps/web/src/lib/version-check.ts
+++ b/apps/web/src/lib/version-check.ts
@@ -4,9 +4,19 @@ const CACHE_TTL_MS = 60 * 60 * 1000;
export type LatestRelease = {
tagName: string;
+ version: string;
url: string;
};
+const DESKTOP_ASSET_PATTERN = /^EdgeEver-(\d+\.\d+\.\d+)-mac-arm64\.dmg$/;
+
+export const findDesktopReleaseVersion = (assetNames: string[]) => {
+ const versions = assetNames
+ .map((name) => DESKTOP_ASSET_PATTERN.exec(name)?.[1])
+ .filter((version): version is string => Boolean(version));
+ return versions.length === 1 ? versions[0] : null;
+};
+
const parseVersion = (value: string) => {
const match = value.match(/v?(\d+)\.(\d+)\.(\d+)/i);
return match ? match.slice(1).map(Number) : null;
@@ -28,9 +38,17 @@ const readCachedRelease = (): LatestRelease | null => {
try {
const cached = JSON.parse(window.sessionStorage.getItem(CACHE_KEY) ?? "null") as {
expiresAt?: number;
- release?: LatestRelease;
+ release?: Partial<LatestRelease>;
} | null;
- return cached?.expiresAt && cached.expiresAt > Date.now() && cached.release ? cached.release : null;
+ return (
+ cached?.expiresAt &&
+ cached.expiresAt > Date.now() &&
+ typeof cached.release?.tagName === "string" &&
+ typeof cached.release.version === "string" &&
+ typeof cached.release.url === "string"
+ )
+ ? cached.release as LatestRelease
+ : null;
} catch {
return null;
}
@@ -46,10 +64,27 @@ export const fetchLatestRelease = async (signal?: AbortSignal): Promise<LatestRe
});
if (!response.ok) throw new Error(`Release lookup failed with ${response.status}`);
- const payload = (await response.json()) as { html_url?: string; tag_name?: string };
+ const payload = (await response.json()) as {
+ assets?: Array<{ name?: unknown }>;
+ html_url?: string;
+ tag_name?: string;
+ };
if (!payload.tag_name || !payload.html_url) throw new Error("Release response is incomplete");
- const release = { tagName: payload.tag_name, url: payload.html_url };
+ const desktopVersion = findDesktopReleaseVersion(
+ payload.assets
+ ?.map((asset) => asset.name)
+ .filter((name): name is string => typeof name === "string") ?? []
+ );
+ const isDesktop = Boolean(window.edgeeverDesktop?.isAvailable);
+ if (isDesktop && !desktopVersion) {
+ throw new Error("Release response does not contain exactly one desktop DMG");
+ }
+ const release = {
+ tagName: payload.tag_name,
+ version: isDesktop ? desktopVersion! : payload.tag_name,
+ url: payload.html_url,
+ };
try {
window.sessionStorage.setItem(CACHE_KEY, JSON.stringify({ expiresAt: Date.now() + CACHE_TTL_MS, release }));
} catch {
diff --git a/docs/release.md b/docs/release.md
index b1a85fd7..36bb25f5 100644
--- a/docs/release.md
+++ b/docs/release.md
@@ -21,6 +21,7 @@ Connect delivery is a separate, explicit operation documented in
```bash
bun run release -- \
+ --bump minor \
--issue-title "Improve the release workflow" \
--label enhancement \
--change-en "Run required release checks in parallel." \
@@ -30,18 +31,54 @@ bun run release -- \
Repeat `--change-en` and `--change-zh` in matching pairs when a Release contains
multiple changes. Repeat `--label` when the tracking Issue needs multiple labels.
+`--bump` is required and must be selected from the user and compatibility impact
+of the complete Release:
+
+- `patch` fixes bugs or makes small security, performance, or visual improvements
+ without adding a new user workflow.
+- `minor` adds a backward-compatible feature or a coherent group of new
+ capabilities.
+- `major` introduces an incompatible data format, sync protocol, public API, or
+ deployment change. Its release notes must describe the compatibility impact
+ and migration path.
+
+The command calculates the next stable version and resets lower components:
+`1.6.52 + patch` becomes `1.6.53`, `+ minor` becomes `1.7.0`, and `+ major`
+becomes `2.0.0`. Commit prefixes may inform the choice, but do not select it
+automatically because code scope and product impact are not equivalent.
+
Use `--dry-run` to inspect the native rebuild plan and generated bilingual notes
without changing local or GitHub state. `--skip-install` skips the post-release
DMG installation and is intended for exceptional or non-macOS runs; normal
maintainer releases should install and launch the published application.
+## Release Cadence and Platform Versions
+
+A formal Release represents a coherent stable product batch, not an individual
+commit or deployment. Related fixes should normally be grouped into one Patch
+Release. A separate Patch is appropriate for urgent crashes, data-loss risks, or
+security fixes. Builds between Releases use the Git commit/build label and do not
+consume stable version numbers.
+
+The root version and GitHub tag identify the overall product Release. Native
+marketing versions change only when that native runtime is rebuilt. Android
+`versionCode` and iOS build numbers remain independent, monotonically increasing
+store build identifiers.
+
+When a verified DMG or APK is reused, its original filename and native version
+remain unchanged. Desktop and Android update checks derive the latest applicable
+version from their corresponding Release asset instead of comparing against the
+overall GitHub tag. This prevents an unchanged native client from repeatedly
+offering an update for a Web-only or API-only Release.
+
## Automated Flow
1. Verify `main`, the working tree, GitHub authentication, the latest formal
Release, and the local/remote commit relationship.
2. Run Web type checking, mobile type checking, the Web production build, and
release-planning tests concurrently.
-3. Use `scripts/plan-native-release.mjs` to determine whether desktop and Android
+3. Calculate the explicit `patch`, `minor`, or `major` version bump, then use
+ `scripts/plan-native-release.mjs` to determine whether desktop and Android
assets must be rebuilt or can be reused. Only affected native versions are
updated.
4. Create a bilingual tracking Issue, commit the version changes to `main`, push,
diff --git a/docs/release.zh-CN.md b/docs/release.zh-CN.md
index 88205b62..19026c4c 100644
--- a/docs/release.zh-CN.md
+++ b/docs/release.zh-CN.md
@@ -18,6 +18,7 @@ EdgeEver 使用一条本地命令准备 Release。该命令会检查仓库、创
```bash
bun run release -- \
+ --bump minor \
--issue-title "Improve the release workflow" \
--label enhancement \
--change-en "Run required release checks in parallel." \
@@ -27,17 +28,44 @@ bun run release -- \
如果一个 Release 包含多项改动,请成对重复传入 `--change-en` 和
`--change-zh`。跟踪 Issue 需要多个 Label 时,可以重复传入 `--label`。
+`--bump` 为必填项,必须根据整个 Release 对用户和兼容性的影响选择:
+
+- `patch`:修复问题,或进行不增加新使用流程的小幅安全、性能和视觉优化。
+- `minor`:增加向后兼容的新功能,或发布一组完整的新能力。
+- `major`:引入不兼容的数据格式、同步协议、公共 API 或部署变化;Release
+ 说明必须写明兼容性影响和迁移方式。
+
+命令会计算下一个稳定版本并将低位归零:`1.6.52 + patch` 得到 `1.6.53`,
+`+ minor` 得到 `1.7.0`,`+ major` 得到 `2.0.0`。提交前缀可以辅助判断,但
+不会自动决定版本级别,因为代码改动类型不等同于产品影响。
+
使用 `--dry-run` 可以只查看原生端重建计划和生成的双语说明,不修改本地或
GitHub 状态。`--skip-install` 会跳过发布后的 DMG 安装,仅适用于特殊情况或
非 macOS 环境;维护者正常发布时仍应安装并启动已发布的应用。
+## 发布节奏与平台版本
+
+正式 Release 代表一批完整、稳定的产品变化,而不是单个提交或单次部署。相关
+修复通常应合并为一个 Patch Release;崩溃、数据丢失风险或安全问题可以紧急
+单独发布。两个正式 Release 之间的构建使用 Git 提交或构建标识,不消耗稳定
+版本号。
+
+根版本和 GitHub tag 表示整体产品 Release。只有原生运行时需要重建时,才更新
+对应的原生展示版本。Android `versionCode` 和 iOS Build Number 继续作为独立、
+严格递增的商店构建标识。
+
+复用已验证的 DMG 或 APK 时,保留其原始文件名和原生版本。桌面端和 Android
+更新检查从各自在 Release 中的资产读取适用版本,而不是直接比较整体 GitHub
+tag,避免原生客户端因为仅涉及 Web 或 API 的 Release 反复提示无效更新。
+
## 自动化流程
1. 检查 `main`、工作区、GitHub 认证、上一个正式 Release,以及本地与远端的
提交关系。
2. 并行执行 Web 类型检查、移动端类型检查、Web 生产构建和 Release 规划测试。
-3. 使用 `scripts/plan-native-release.mjs` 判断桌面端和 Android 资产需要重建
- 还是可以复用,并且只更新受影响原生端的版本。
+3. 按显式选择的 `patch`、`minor` 或 `major` 计算版本,再使用
+ `scripts/plan-native-release.mjs` 判断桌面端和 Android 资产需要重建还是
+ 可以复用,并且只更新受影响原生端的版本。
4. 创建双语跟踪 Issue,将版本变更提交并推送到 `main`,然后创建带双语说明的
Draft Release。
5. 并行触发桌面端和 Android 资产工作流,等待两者完成,并在正式发布前检查
diff --git a/package.json b/package.json
index eabaf0ce..bdae7f04 100644
--- a/package.json
+++ b/package.json
@@ -34,7 +34,7 @@
"build:desktop": "EDGE_EVER_DESKTOP_BUILD=1 bun run build:web && bun run build:desktop:sidecar && bun run --cwd apps/desktop dist",
"benchmark:desktop:sidecar": "bun scripts/benchmark-desktop-sidecar.mjs",
"verify:web-performance": "bun scripts/verify-web-performance.mjs",
- "test:release-planning": "bun test scripts/plan-native-release.test.mjs scripts/check-native-release-assets.test.mjs scripts/release.test.mjs scripts/validate-store-delivery.test.mjs scripts/store-delivery.test.mjs",
+ "test:release-planning": "bun test scripts/plan-native-release.test.mjs scripts/check-native-release-assets.test.mjs scripts/release.test.mjs scripts/validate-store-delivery.test.mjs scripts/store-delivery.test.mjs apps/web/src/lib/version-check.test.mjs apps/mobile/src/lib/mobile-release.test.ts",
"release": "bun scripts/release.mjs",
"publish:stores": "bun scripts/store-delivery.mjs",
"test:desktop:sidecar": "bun scripts/test-desktop-sidecar.mjs",
diff --git a/scripts/release.mjs b/scripts/release.mjs
index 57007192..9c499995 100644
--- a/scripts/release.mjs
+++ b/scripts/release.mjs
@@ -18,6 +18,7 @@ import { nativeReleaseAssetsReady } from "./check-native-release-assets.mjs";
import { planNativeRelease } from "./plan-native-release.mjs";
const DEFAULT_REPOSITORY = "tianma-if/edgeever";
+const VERSION_BUMPS = new Set(["patch", "minor", "major"]);
const POLL_INTERVAL_MS = 10_000;
const RUN_DISCOVERY_TIMEOUT_MS = 60_000;
const RELEASE_WORKFLOWS = {
@@ -39,12 +40,15 @@ export const RELEASE_VALIDATIONS = [
"scripts/release.test.mjs",
"scripts/validate-store-delivery.test.mjs",
"scripts/store-delivery.test.mjs",
+ "apps/web/src/lib/version-check.test.mjs",
+ "apps/mobile/src/lib/mobile-release.test.ts",
],
},
];
const usage = `Usage:
bun run release -- \\
+ --bump minor \\
--issue-title "Release issue title" \\
--label bug \\
--change-en "English user-facing change" \\
@@ -53,6 +57,7 @@ const usage = `Usage:
Repeat --change-en and --change-zh for multiple paired release bullets.
Options:
+ --bump <level> Required version bump: patch, minor, or major
--repository <owner/name> GitHub repository (default: ${DEFAULT_REPOSITORY})
--issue-title <title> Required umbrella Issue title
--label <label> Required Issue label; may be repeated
@@ -66,6 +71,7 @@ Options:
export const parseReleaseArgs = (argv) => {
const options = {
repository: DEFAULT_REPOSITORY,
+ bump: "",
issueTitle: "",
labels: [],
changesEn: [],
@@ -77,6 +83,7 @@ export const parseReleaseArgs = (argv) => {
const valueOptions = new Map([
["--repository", "repository"],
+ ["--bump", "bump"],
["--issue-title", "issueTitle"],
["--label", "labels"],
["--change-en", "changesEn"],
@@ -120,6 +127,9 @@ export const parseReleaseArgs = (argv) => {
if (!/^[^/\s]+\/[^/\s]+$/.test(options.repository)) {
throw new Error("--repository must use owner/name format.");
}
+ if (!VERSION_BUMPS.has(options.bump)) {
+ throw new Error("--bump must be patch, minor, or major.");
+ }
if (!options.issueTitle) {
throw new Error("--issue-title is required.");
}
@@ -135,12 +145,20 @@ export const parseReleaseArgs = (argv) => {
return options;
};
-export const nextPatchVersion = (version) => {
+export const nextVersion = (version, bump) => {
const match = /^(\d+)\.(\d+)\.(\d+)$/.exec(version);
if (!match) {
throw new Error(`Expected a stable X.Y.Z version, received: ${version}`);
}
- return `${match[1]}.${match[2]}.${Number(match[3]) + 1}`;
+ if (!VERSION_BUMPS.has(bump)) {
+ throw new Error(`Expected patch, minor, or major bump, received: ${bump}`);
+ }
+ const major = Number(match[1]);
+ const minor = Number(match[2]);
+ const patch = Number(match[3]);
+ if (bump === "major") return `${major + 1}.0.0`;
+ if (bump === "minor") return `${major}.${minor + 1}.0`;
+ return `${major}.${minor}.${patch + 1}`;
};
export const buildIssueBody = ({ changesEn, changesZh }) => [
@@ -166,6 +184,7 @@ export const buildReleaseNotes = ({
desktopRebuild,
mobileRebuild,
previousTag,
+ bump,
}) => [
"## Key Changes",
"",
@@ -179,6 +198,7 @@ export const buildReleaseNotes = ({
"- `bun run typecheck:mobile`",
"- `bun run build:web`",
"- Native release planning and asset audit tests.",
+ `- Version bump: \`${bump}\`.`,
desktopRebuild
? "- Desktop release plan: rebuild, sign, notarize, and verify a new macOS arm64 DMG."
: `- Desktop release plan: reuse the verified assets from ${previousTag} with their original filenames and checksums.`,
@@ -200,6 +220,7 @@ export const buildReleaseNotes = ({
"- `bun run typecheck:mobile`",
"- `bun run build:web`",
"- 原生 Release 规划与资产审计测试。",
+ `- 版本递增级别:\`${bump}\`。`,
desktopRebuild
? "- 桌面端 Release 计划:重新构建、签名、公证并验证新的 macOS arm64 DMG。"
: `- 桌面端 Release 计划:复用 ${previousTag} 已验证资产,并保留原始文件名与校验和。`,
@@ -640,7 +661,7 @@ const releaseMain = async (options) => {
const rootPackage = readJson("package.json");
const previousVersion = previousTag.replace(/^v/, "");
- const expectedNextVersion = nextPatchVersion(previousVersion);
+ const expectedNextVersion = nextVersion(previousVersion, options.bump);
const headShaBeforeRelease = run("git", ["rev-parse", "HEAD"], { capture: true });
let resumedDraft = null;
if (rootPackage.version === expectedNextVersion) {
@@ -689,6 +710,7 @@ const releaseMain = async (options) => {
desktopRebuild: desktopPlan.rebuild,
mobileRebuild: mobilePlan.rebuild,
previousTag,
+ bump: options.bump,
}));
return;
}
@@ -742,6 +764,7 @@ const releaseMain = async (options) => {
desktopRebuild: desktopPlan.rebuild,
mobileRebuild: mobilePlan.rebuild,
previousTag,
+ bump: options.bump,
});
const draftUrl = run("gh", [
"release",
diff --git a/scripts/release.test.mjs b/scripts/release.test.mjs
index 24d76006..d1c3d7cd 100644
--- a/scripts/release.test.mjs
+++ b/scripts/release.test.mjs
@@ -2,7 +2,7 @@ import { describe, expect, test } from "bun:test";
import {
buildIssueBody,
buildReleaseNotes,
- nextPatchVersion,
+ nextVersion,
parseReleaseArgs,
reusedAssetMatches,
selectPublishedDmg,
@@ -14,6 +14,8 @@ describe("release automation", () => {
parseReleaseArgs([
"--issue-title",
"Improve release flow",
+ "--bump",
+ "minor",
"--label",
"enhancement",
"--change-en",
@@ -23,6 +25,7 @@ describe("release automation", () => {
]),
).toMatchObject({
issueTitle: "Improve release flow",
+ bump: "minor",
labels: ["enhancement"],
changesEn: ["Run checks in parallel."],
changesZh: ["并行运行检查。"],
@@ -34,6 +37,8 @@ describe("release automation", () => {
parseReleaseArgs([
"--issue-title",
"Broken input",
+ "--bump",
+ "patch",
"--label",
"bug",
"--change-en",
@@ -42,9 +47,27 @@ describe("release automation", () => {
).toThrow("--change-en and --change-zh");
});
- test("increments stable patch versions", () => {
- expect(nextPatchVersion("1.6.50")).toBe("1.6.51");
- expect(() => nextPatchVersion("1.6")).toThrow("stable X.Y.Z");
+ test("increments stable semantic versions", () => {
+ expect(nextVersion("1.6.50", "patch")).toBe("1.6.51");
+ expect(nextVersion("1.6.50", "minor")).toBe("1.7.0");
+ expect(nextVersion("1.6.50", "major")).toBe("2.0.0");
+ expect(() => nextVersion("1.6", "patch")).toThrow("stable X.Y.Z");
+ expect(() => nextVersion("1.6.50", "automatic")).toThrow("patch, minor, or major");
+ });
+
+ test("requires an explicit version bump", () => {
+ expect(() =>
+ parseReleaseArgs([
+ "--issue-title",
+ "Missing bump",
+ "--label",
+ "bug",
+ "--change-en",
+ "Fix a bug.",
+ "--change-zh",
+ "修复问题。",
+ ])
+ ).toThrow("--bump must be patch, minor, or major");
});
test("builds required bilingual release note structure with real newlines", () => {
@@ -55,11 +78,14 @@ describe("release automation", () => {
desktopRebuild: false,
mobileRebuild: false,
previousTag: "v1.6.50",
+ bump: "patch",
});
expect(notes).toContain("## Key Changes");
expect(notes).toContain("Related Issue: #126");
expect(notes).toContain("## 🇨🇳 中文说明 / Chinese Changelog");
expect(notes).toContain("关联 Issue:#126");
+ expect(notes).toContain("Version bump: `patch`.");
+ expect(notes).toContain("版本递增级别:`patch`。");
expect(notes).not.toContain("\\n");
});