From 8762df239259a413b33617eccc6d32d5db25adfe Mon Sep 17 00:00:00 2001 From: feige996 <1020102647@qq.com> Date: Wed, 28 May 2025 11:40:26 +0800 Subject: [PATCH 1/3] =?UTF-8?q?ci:=20=E9=87=8D=E6=9E=84=E5=B7=A5=E4=BD=9C?= =?UTF-8?q?=E6=B5=81=E9=85=8D=E7=BD=AE=E5=B9=B6=E6=B7=BB=E5=8A=A0=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E5=8F=91=E5=B8=83=E6=97=A5=E5=BF=97=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 重命名 auto-merge.yml 中的任务名称并优化结构 - 新增 release-log.yml 工作流用于自动生成发布日志 - 删除旧的 release.yml 工作流文件 ``` 这个提交消息： 1. 使用了 `ci` 类型，因为这些变更都是针对 CI/CD 工作流配置的修改 2. 简洁地描述了三个主要变更： - 重构了 auto-merge 工作流 - 新增了发布日志功能 - 删除了旧的工作流文件 3. 符合中文语言习惯和提交消息规范 4. 在50字符限制内完成了描述 5. 使用动词开头并保持简洁 --- .github/workflows/auto-merge.yml | 33 ++++++++++++++++++- .../{release.yml => release-log.yml} | 0 2 files changed, 32 insertions(+), 1 deletion(-) rename .github/workflows/{release.yml => release-log.yml} (100%) diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml index a84e52e..0c12579 100644 --- a/.github/workflows/auto-merge.yml +++ b/.github/workflows/auto-merge.yml @@ -7,7 +7,8 @@ on: workflow_dispatch: # 手动触发 jobs: - auto-merge: + merge-to-main: + name: Merge base into main runs-on: ubuntu-latest steps: - name: Checkout repository @@ -24,6 +25,16 @@ jobs: git merge base --no-ff -m "Auto merge base into main" git push origin main + merge-to-i18n: + name: Merge base into i18n + runs-on: ubuntu-latest + steps: + - name: Checkout repository + uses: actions/checkout@v4 + with: + fetch-depth: 0 + token: ${{ secrets.GH_TOKEN_AUTO_MERGE }} + - name: Merge base into i18n run: | git config user.name "GitHub Actions" @@ -32,6 +43,16 @@ jobs: git merge base --no-ff -m "Auto merge base into i18n" git push origin i18n + merge-to-tabbar: + name: Merge base into tabbar + runs-on: ubuntu-latest + steps: + - name: Checkout repository + uses: actions/checkout@v4 + with: + fetch-depth: 0 + token: ${{ secrets.GH_TOKEN_AUTO_MERGE }} + - name: Merge base into tabbar run: | git config user.name "GitHub Actions" @@ -40,6 +61,16 @@ jobs: git merge base --no-ff -m "Auto merge base into tabbar" git push origin tabbar + merge-to-spa: + name: Merge base into spa + runs-on: ubuntu-latest + steps: + - name: Checkout repository + uses: actions/checkout@v4 + with: + fetch-depth: 0 + token: ${{ secrets.GH_TOKEN_AUTO_MERGE }} + - name: Merge base into spa run: | git config user.name "GitHub Actions" diff --git a/.github/workflows/release.yml b/.github/workflows/release-log.yml similarity index 100% rename from .github/workflows/release.yml rename to .github/workflows/release-log.yml From cd182d3e20d5855d1ea73d4a2091746baf0a3034 Mon Sep 17 00:00:00 2001 From: feige996 <1020102647@qq.com> Date: Wed, 28 May 2025 15:15:24 +0800 Subject: [PATCH 2/3] =?UTF-8?q?chore:=20=E6=9B=B4=E6=96=B0=20@esbuild/darw?= =?UTF-8?q?in=20=E4=BE=9D=E8=B5=96=E8=87=B3=200.25.5=20=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 升级 @esbuild/darwin-arm64 和 @esbuild/darwin-x64 依赖版本以获取最新功能和修复 --- package.json | 4 ++-- pnpm-lock.yaml | 18 +++++++++--------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/package.json b/package.json index 5079e08..a449654 100644 --- a/package.json +++ b/package.json @@ -115,8 +115,8 @@ "@dcloudio/uni-cli-shared": "3.0.0-4060620250520001", "@dcloudio/uni-stacktracey": "3.0.0-4060620250520001", "@dcloudio/vite-plugin-uni": "3.0.0-4060620250520001", - "@esbuild/darwin-arm64": "0.20.2", - "@esbuild/darwin-x64": "0.20.2", + "@esbuild/darwin-arm64": "0.25.5", + "@esbuild/darwin-x64": "0.25.5", "@iconify-json/carbon": "^1.2.4", "@rollup/rollup-darwin-x64": "^4.28.0", "@types/node": "^20.17.9", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index e9d7daa..ea3c5fd 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -106,11 +106,11 @@ importers: specifier: 3.0.0-4060620250520001 version: 3.0.0-4060620250520001(postcss@8.4.49)(rollup@4.41.1)(vite@6.3.5(@types/node@20.17.9)(jiti@2.4.2)(sass@1.77.8)(terser@5.36.0)(yaml@2.6.1))(vue@3.5.15(typescript@5.7.2)) '@esbuild/darwin-arm64': - specifier: 0.20.2 - version: 0.20.2 + specifier: 0.25.5 + version: 0.25.5 '@esbuild/darwin-x64': - specifier: 0.20.2 - version: 0.20.2 + specifier: 0.25.5 + version: 0.25.5 '@iconify-json/carbon': specifier: ^1.2.4 version: 1.2.4 @@ -6885,16 +6885,16 @@ snapshots: '@esbuild/android-x64@0.25.5': optional: true - '@esbuild/darwin-arm64@0.20.2': {} - - '@esbuild/darwin-arm64@0.25.5': + '@esbuild/darwin-arm64@0.20.2': optional: true - '@esbuild/darwin-x64@0.20.2': {} + '@esbuild/darwin-arm64@0.25.5': {} - '@esbuild/darwin-x64@0.25.5': + '@esbuild/darwin-x64@0.20.2': optional: true + '@esbuild/darwin-x64@0.25.5': {} + '@esbuild/freebsd-arm64@0.20.2': optional: true From 9f832d6bb8a36aec5362d5ec81724a780dd4ab39 Mon Sep 17 00:00:00 2001 From: feige996 <1020102647@qq.com> Date: Wed, 28 May 2025 15:18:12 +0800 Subject: [PATCH 3/3] =?UTF-8?q?chore:=20=E5=9C=A8=20package.json=20?= =?UTF-8?q?=E4=B8=AD=E6=B7=BB=E5=8A=A0=20update-time=20=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 添加 update-time 字段以记录项目最后更新时间，便于维护和版本追踪 --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index a449654..8dee604 100644 --- a/package.json +++ b/package.json @@ -3,6 +3,7 @@ "type": "commonjs", "version": "2.10.1", "description": "unibest - 最好的 uniapp 开发模板", + "update-time": "2025-05-28", "author": { "name": "feige996", "zhName": "菲鸽",