Merge pull request #24509 from abpframework/skoc10-patch-1

Update GitHub Actions workflow for branch merging

.github/workflows/auto-pr.yml

@@ -1,13 +1,13 @@
-name: Merge branch rel-10.1 with rel-10.0
+name: Merge branch dev with rel-10.1
 on:
   push:
     branches:
-      - rel-10.0
+      - rel-10.1
 permissions:
   contents: read
 
 jobs:
-  merge-rel-10-1-with-rel-10-0:
+  merge-dev-with-rel-10-1:
     permissions:
       contents: write  # for peter-evans/create-pull-request to create branch
       pull-requests: write  # for peter-evans/create-pull-request to create a PR
@@ -15,17 +15,17 @@ jobs:
     steps:
       - uses: actions/checkout@v2
         with:
-          ref: rel-10.1
+          ref: dev
       - name: Reset promotion branch
         run: |
-          git fetch origin rel-10.0:rel-10.0
-          git reset --hard rel-10.0
+          git fetch origin rel-10.1:rel-10.1
+          git reset --hard rel-10.1
       - name: Create Pull Request
         uses: peter-evans/create-pull-request@v3
         with:
-          branch: auto-merge/rel-10-0/${{github.run_number}}
-          title: Merge branch rel-10.1 with rel-10.0
-          body: This PR generated automatically to merge rel-10.1 with rel-10.0. Please review the changed files before merging to prevent any errors that may occur.
+          branch: auto-merge/rel-10-1/${{github.run_number}}
+          title: Merge branch dev with rel-10.1
+          body: This PR generated automatically to merge dev with rel-10.1. Please review the changed files before merging to prevent any errors that may occur.
           reviewers: maliming
           draft: true
           token: ${{ github.token }}
@@ -34,5 +34,5 @@ jobs:
           GH_TOKEN: ${{ secrets.BOT_SECRET }}
         run: |
           gh pr ready
-          gh pr review auto-merge/rel-10-0/${{github.run_number}} --approve
-          gh pr merge auto-merge/rel-10-0/${{github.run_number}} --merge --auto --delete-branch
+          gh pr review auto-merge/rel-10-1/${{github.run_number}} --approve
+          gh pr merge auto-merge/rel-10-1/${{github.run_number}} --merge --auto --delete-branch