Update AutoMerge.yml

mgz0227 · Jul 22, 2024 · 63847fa · 63847fa
1 parent 175f975
commit 63847fa
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/.github/workflows/AutoMerge.yml b/.github/workflows/AutoMerge.yml
@@ -15,7 +15,10 @@ jobs:
         uses: actions/checkout@v4
         with:
           fetch-depth: 0  # 必须获取所有分支和提交记录才能进行合并操作
-
+      - uses: de-vri-es/setup-git-credentials@v2
+        with:
+          credentials: https://mgz0227:${{ secrets.AUTOMERGE }}@github.com/
+
       - name: Set up Node.js
         uses: actions/setup-node@v4
         with:
@@ -43,8 +46,10 @@ jobs:
 
       - name: Configure git
         run: |
-          git config --local user.name "mgz0227"
-          git config --local user.email "[email protected]"
+          git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com"
+          git config --global user.name "github-actions[bot]"
+          sudo timedatectl set-timezone "Asia/Shanghai"
+
       - name: Merge PR
         if: env.MERGE == 'true'
         env: