diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml
index b1ea5c2..5c4005b 100644
--- a/.github/workflows/auto-merge.yml
+++ b/.github/workflows/auto-merge.yml
@@ -7,6 +7,24 @@ on:
workflow_dispatch: # 手动触发
jobs:
+ merge-to-release:
+ name: Merge main into release
+ runs-on: ubuntu-latest
+ steps:
+ - name: Checkout repository
+ uses: actions/checkout@v4
+ with:
+ fetch-depth: 0
+ token: ${{ secrets.GH_TOKEN_AUTO_MERGE }}
+
+ - name: Merge main into release
+ run: |
+ git config user.name "GitHub Actions"
+ git config user.email "actions@github.com"
+ git checkout release
+ git merge main --no-ff -m "Auto merge main into release"
+ git push origin release
+
merge-to-i18n:
name: Merge main into i18n
runs-on: ubuntu-latest
diff --git a/.vscode/vue3.code-snippets b/.vscode/vue3.code-snippets
index 5ecf79f..a196e90 100644
--- a/.vscode/vue3.code-snippets
+++ b/.vscode/vue3.code-snippets
@@ -28,10 +28,10 @@
"}",
"\n",
"\n",
"",
- " $2",
+ " $3",
"\n",
"