diff --git a/.github/workflows/auto-pr.yml b/.github/workflows/auto-pr.yml index 19001963a6..07c197e325 100644 --- a/.github/workflows/auto-pr.yml +++ b/.github/workflows/auto-pr.yml @@ -1,13 +1,13 @@ -name: Merge branch dev with prerel-8.3 +name: Merge branch dev with rel-8.3 on: push: branches: - - prerel-8.3 + - rel-8.3 permissions: contents: read jobs: - merge-dev-with-prerel-8-3: + merge-dev-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 @@ -18,19 +18,19 @@ jobs: ref: dev - name: Reset promotion branch run: | - git fetch origin prerel-8.3:prerel-8.3 - git reset --hard prerel-8.3 + git fetch origin rel-8.3:rel-8.3 + git reset --hard rel-8.3 - name: Create Pull Request uses: peter-evans/create-pull-request@v3 with: - branch: auto-merge/prerel-8-3/${{github.run_number}} - title: Merge branch dev with prerel-8.3 - body: This PR generated automatically to merge dev with prerel-8.3. Please review the changed files before merging to prevent any errors that may occur. + 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. reviewers: maliming token: ${{ github.token }} - name: Merge Pull Request env: GH_TOKEN: ${{ secrets.BOT_SECRET }} run: | - gh pr review auto-merge/prerel-8-3/${{github.run_number}} --approve - gh pr merge auto-merge/prerel-8-3/${{github.run_number}} --merge --auto --delete-branch \ No newline at end of file + 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