From 7936f69994856a069afdcf759d4a1aee78d00373 Mon Sep 17 00:00:00 2001 From: selman koc <64414348+skoc10@users.noreply.github.com> Date: Tue, 22 Oct 2024 14:19:46 +0300 Subject: [PATCH] Update auto-pr.yml for rel-9.0 --- .github/workflows/auto-pr.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/auto-pr.yml b/.github/workflows/auto-pr.yml index 647397ea04..25f6e66ab1 100644 --- a/.github/workflows/auto-pr.yml +++ b/.github/workflows/auto-pr.yml @@ -1,13 +1,13 @@ -name: Merge branch dev with prerel-9.0 +name: Merge branch dev with rel-9.0 on: push: branches: - - prerel-9.0 + - rel-9.0 permissions: contents: read jobs: - merge-dev-with-prerel-9-0: + merge-dev-with-rel-9-0: 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-9.0:prerel-9.0 - git reset --hard prerel-9.0 + git fetch origin rel-9.0:rel-9.0 + git reset --hard rel-9.0 - 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.0 - body: This PR generated automatically to merge dev with prerel-9.0. Please review the changed files before merging to prevent any errors that may occur. + branch: auto-merge/rel-9-0/${{github.run_number}} + title: Merge branch dev with rel-9.0 + body: This PR generated automatically to merge dev with rel-9.0. 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-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-0/${{github.run_number}} --approve + gh pr merge auto-merge/rel-9-0/${{github.run_number}} --merge --auto --delete-branch