Merge branch 'base'

This commit is contained in:
feige996
2025-05-22 19:01:09 +08:00
4 changed files with 8 additions and 8 deletions

View File

@@ -10,11 +10,11 @@ jobs:
auto-merge:
runs-on: ubuntu-latest
steps:
# - name: Checkout repository
# uses: actions/checkout@v3
# with:
# fetch-depth: 0
# token: ${{ secrets.GH_TOKEN_AUTO_MERGE2 }}
- name: Checkout repository
uses: actions/checkout@v4
with:
fetch-depth: 0
token: ${{ secrets.GH_TOKEN_AUTO_MERGE }}
- name: Merge main into aliyun
run: |

View File

@@ -116,4 +116,4 @@ jobs:
with:
generateReleaseNotes: false
bodyFile: changelog.md
tag: ${{ github.ref_name }}
tag: ${{ github.ref_name }}