Merge branch 'mgz0227:main' into main

mgz0227 · Jun 3, 2024 · ef7243d · ef7243d
2 parents b05f130 + 5b3ac7b
commit ef7243d
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/.github/workflows/AutoMerge.yml b/.github/workflows/AutoMerge.yml
@@ -33,13 +33,13 @@ jobs:
 
       - name: Configure git
         run: |
-          git config --global user.name "mgz0227"
-          git config --global user.email "miaogongzi0227@gmail.com"
+          git config --global user.name "github-actions[bot]"
+          git config --global user.email "github-actions[bot]@users.noreply.github.com"
 
       - name: Merge PR
         if: env.MERGE == 'true'
         env:
-          GITHUB_TOKEN: ${{ secrets.AUTOMERGE }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           PR_NUMBER=${{ github.event.pull_request.number }}
           PR_BRANCH=refs/pull/$PR_NUMBER/head
@@ -56,4 +56,4 @@ jobs:
           git merge --no-ff $PR_BRANCH -m "Merge pull request #$PR_NUMBER from $PR_BRANCH"
 
           # Push the changes
-          git push https://x-access-token:${{ secrets.AUTOMERGE }}@github.com/${{ github.repository }} $BASE_BRANCH
+          git push https://x-access-token:${{ secrets.GITHUB_TOKEN }}@github.com/${{ github.repository }}.git $BASE_BRANCH