Add App to do the merging (#4461)

.github/workflows/auto-update-app-headers.yml

@@ -5,8 +5,8 @@ on:
     branches:
       - main
     paths:
-      - 'ct/**.sh'
-  workflow_dispatch: 
+      - "ct/**.sh"
+  workflow_dispatch:
 
 jobs:
   update-app-files:
@@ -25,6 +25,13 @@ jobs:
           app-id: ${{ vars.APP_ID }}
           private-key: ${{ secrets.APP_PRIVATE_KEY }}
 
+      - name: Generate a token for PR approval and merge
+        id: generate-token-merge
+        uses: actions/create-github-app-token@v1
+        with:
+          app-id: ${{ secrets.APP_ID_APPROVE_AND_MERGE }}
+          private-key: ${{ secrets.APP_KEY_APPROVE_AND_MERGE }}
+
       # Step 1: Checkout repository
       - name: Checkout repository
         uses: actions/checkout@v2
@@ -80,7 +87,7 @@ jobs:
                        --label "automated pr"
         env:
           GH_TOKEN: ${{ steps.generate-token.outputs.token }}
-      
+
       - name: Approve pull request
         if: env.changed == 'true'
         env:
@@ -90,13 +97,15 @@ jobs:
           if [ -n "$PR_NUMBER" ]; then
             gh pr review $PR_NUMBER --approve
           fi
-      
+
       - name: Approve pull request and merge
         if: env.changed == 'true'
         env:
-          GH_TOKEN: ${{ secrets.PAT_AUTOMERGE }}
+          GH_TOKEN: ${{ steps.generate-token-merge.outputs.token }}
         run: |
-          PR_NUMBER=$(gh pr list --head "pr-update-app-files" --json number --jq '.[].number')
+          git config --global user.name "github-actions-automege[bot]"
+          git config --global user.email "github-actions-automege[bot]@users.noreply.github.com"
+          PR_NUMBER=$(gh pr list --head "${BRANCH_NAME}" --json number --jq '.[].number')
           if [ -n "$PR_NUMBER" ]; then
             gh pr review $PR_NUMBER --approve
             gh pr merge $PR_NUMBER --squash --admin