Merge pull request #21891 from abpframework/auto-merge/rel-9-0/3387

Merge branch rel-9.1 with rel-9.0

.github/workflows/auto-pr.yml

@@ -1,13 +1,13 @@
-name: Merge branch dev with prerel-9.1
+name: Merge branch dev with rel-9.1
 on:
   push:
     branches:
-      - prerel-9.1
+      - rel-9.1
 permissions:
   contents: read
 
 jobs:
-  merge-dev-with-prerel-9-1:
+  merge-dev-with-rel-9-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
@@ -18,14 +18,14 @@ jobs:
           ref: dev
       - name: Reset promotion branch
         run: |
-          git fetch origin prerel-9.1:prerel-9.1
-          git reset --hard prerel-9.1
+          git fetch origin rel-9.1:rel-9.1
+          git reset --hard rel-9.1
       - name: Create Pull Request
         uses: peter-evans/create-pull-request@v3
         with:
-          branch: auto-merge/prerel-9-0/${{github.run_number}}
-          title: Merge branch dev with prerel-9.1
-          body: This PR generated automatically to merge dev with prerel-9.1. Please review the changed files before merging to prevent any errors that may occur.
+          branch: auto-merge/rel-9-1/${{github.run_number}}
+          title: Merge branch dev with rel-9.1
+          body: This PR generated automatically to merge dev with rel-9.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/prerel-9-0/${{github.run_number}} --approve
-          gh pr merge auto-merge/prerel-9-0/${{github.run_number}} --merge --auto --delete-branch
+          gh pr review auto-merge/rel-9-1/${{github.run_number}} --approve
+          gh pr merge auto-merge/rel-9-1/${{github.run_number}} --merge --auto --delete-branch