Merge pull request #25528 from abpframework/skoc10-patch-2

Update workflow to merge rel-10.5 with rel-10.4

Author: voloagent

.github/workflows/auto-pr.yml

@@ -1,4 +1,4 @@
-name: Merge branch dev with rel-10.4
+name: Merge branch rel-10.5 with rel-10.4
 on:
   push:
     branches:
@@ -7,15 +7,15 @@ permissions:
   contents: read
 
 jobs:
-  merge-dev-with-rel-10-4:
+  merge-rel-10-5-with-rel-10-4:
     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
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
         with:
-          ref: dev
+          ref: rel-10.5
       - name: Reset promotion branch
         run: |
           git fetch origin rel-10.4:rel-10.4
@@ -24,8 +24,8 @@ jobs:
         uses: peter-evans/create-pull-request@v3
         with:
           branch: auto-merge/rel-10-4/${{github.run_number}}
-          title: Merge branch dev with rel-10.4
-          body: This PR generated automatically to merge dev with rel-10.4. Please review the changed files before merging to prevent any errors that may occur.
+          title: Merge branch rel-10.5 with rel-10.4
+          body: This PR generated automatically to merge rel-10.5 with rel-10.4. Please review the changed files before merging to prevent any errors that may occur.
           draft: true
           token: ${{ github.token }}
       - name: Merge Pull Request