Skip to content

Commit 2712f36

Browse files
author
ShellMonster
committed
chore: filter merge commits from Release Notes and bump version to 2.4.3
- Add --no-merges flag to git log in release.yml to exclude merge commits - Bump frontend version: 1.0.1 → 1.0.2 - Bump desktop version: 2.4.2 → 2.4.3 This ensures cleaner Release Notes without PR merge commit noise.
1 parent 956a2a6 commit 2712f36

4 files changed

Lines changed: 6 additions & 6 deletions

File tree

.github/workflows/release.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,9 +93,9 @@ jobs:
9393
PREV_TAG=$(git describe --tags --abbrev=0 ${{ github.ref_name }}^ 2>/dev/null || git rev-list --max-parents=0 HEAD)
9494
echo "Previous tag: $PREV_TAG"
9595
96-
# 提取 commit 记录,并进行初步的 shell 转义处理
97-
# 使用 raw 格式提取,避免特殊的字符干扰
98-
LOGS=$(git log $PREV_TAG..${{ github.ref_name }} --pretty=format:"%s")
96+
# 提取 commit 记录(不包括 merge commit)
97+
# --no-merges: 只显示实际代码变更的 commit,过滤掉 PR merge 产生的合并提交
98+
LOGS=$(git log $PREV_TAG..${{ github.ref_name }} --pretty=format:"%s" --no-merges)
9999
100100
# 初始化分类内容
101101
FEATS=""

desktop/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "nano-banana-pro-frontend",
33
"private": true,
4-
"version": "2.4.2",
4+
"version": "2.4.3",
55
"license": "MIT",
66
"description": "大香蕉图片生成工具 - 批量图片生成应用前端",
77
"type": "module",

desktop/src-tauri/tauri.conf.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"$schema": "https://schema.tauri.app/config/2",
33
"productName": "大香蕉 AI",
4-
"version": "2.4.2",
4+
"version": "2.4.3",
55
"identifier": "com.dztool.banana",
66
"build": {
77
"beforeDevCommand": "npm run dev",

frontend/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "nano-banana-pro-frontend",
33
"private": true,
4-
"version": "1.0.1",
4+
"version": "1.0.2",
55
"description": "大香蕉图片生成工具 - 批量图片生成应用前端",
66
"type": "module",
77
"scripts": {

0 commit comments

Comments
 (0)