diff --git a/.github/workflows/auto-pr.yml b/.github/workflows/auto-pr.yml index 526cfc144b..d394ca56b3 100644 --- a/.github/workflows/auto-pr.yml +++ b/.github/workflows/auto-pr.yml @@ -1,4 +1,4 @@ -name: Merge branch dev with rel-8.3 +name: Merge branch prerel-9.0 with rel-8.3 on: push: branches: @@ -7,7 +7,7 @@ permissions: contents: read jobs: - merge-dev-with-rel-8-3: + merge-prerel-9-0-with-rel-8-3: 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,7 +15,7 @@ jobs: steps: - uses: actions/checkout@v2 with: - ref: dev + ref: prerel-9.0 - name: Reset promotion branch run: | git fetch origin rel-8.3:rel-8.3 @@ -24,8 +24,8 @@ jobs: uses: peter-evans/create-pull-request@v3 with: branch: auto-merge/rel-8-3/${{github.run_number}} - title: Merge branch dev with rel-8.3 - body: This PR generated automatically to merge dev with rel-8.3. Please review the changed files before merging to prevent any errors that may occur. + title: Merge branch prerel-9.0 with rel-8.3 + body: This PR generated automatically to merge prerel-9.0 with rel-8.3. Please review the changed files before merging to prevent any errors that may occur. reviewers: maliming token: ${{ github.token }} - name: Merge Pull Request @@ -33,4 +33,4 @@ jobs: GH_TOKEN: ${{ secrets.BOT_SECRET }} run: | gh pr review auto-merge/rel-8-3/${{github.run_number}} --approve - gh pr merge auto-merge/rel-8-3/${{github.run_number}} --merge --auto --delete-branch \ No newline at end of file + gh pr merge auto-merge/rel-8-3/${{github.run_number}} --merge --auto --delete-branch