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] =?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