pass secret with instead of

Author: 0marperez

.github/actions/merge-main/action.yml

@@ -3,8 +3,6 @@ description: Merges main into feature branches (*-main)
 inputs:
   exempt-branches:
     description: Feature branches that are exempt from receiving merges from main (comma separated, no blank space)
-  ci-user-pat:
-    description: The CI user's personal access token to write to the repo
 
 runs:
   using: composite
@@ -13,7 +11,7 @@ runs:
       uses: actions/checkout@v4
       with:
         fetch-depth: 0
-        token: ${{ inputs.ci-user-pat }}
+        token: ${{ secrets.CI_USER_PAT }}
 
     - name: Set up Git
       shell: bash

.github/workflows/merge-main.yml

@@ -3,13 +3,15 @@ on:
   push:
     branches: [ main ]
   workflow_dispatch:
+  pull_request:
 
 jobs:
   merge:
     runs-on: ubuntu-latest
     steps:
       - name: Merge main
-        uses: awslabs/aws-kotlin-repo-tools/.github/actions/merge-main@main
+        uses: awslabs/aws-kotlin-repo-tools/.github/actions/merge-main@fix-auto-merge-credentials
         with:
-          ci-user-pat: ${{ secrets.CI_USER_PAT }}
-          exempt-branches: # Add any if required
+          exempt-branches: # Add any if required
+        secrets:
+          CI_USER_PAT: ${{ secrets.CI_USER_PAT }}