From 1ec580ef121742cbfd967951418f0b1f1aa9ea4d Mon Sep 17 00:00:00 2001 From: maliming Date: Tue, 21 Nov 2023 10:50:04 +0800 Subject: [PATCH] Update `auto-pr` for `rel-8.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 98a0c7f62e..02747e1651 100644 --- a/.github/workflows/auto-pr.yml +++ b/.github/workflows/auto-pr.yml @@ -1,13 +1,13 @@ -name: Merge branch dev with rel-7.4 +name: Merge branch dev with rel-8.0 on: push: branches: - - rel-7.4 + - rel-8.0 permissions: contents: read jobs: - merge-dev-with-rel-7-4: + merge-dev-with-rel-8-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 rel-7.4:rel-7.4 - git reset --hard rel-7.4 + git fetch origin rel-8.0:rel-8.0 + git reset --hard rel-8.0 - name: Create Pull Request uses: peter-evans/create-pull-request@v3 with: - branch: auto-merge/rel-7-4/${{github.run_number}} - title: Merge branch dev with rel-7.4 - body: This PR generated automatically to merge dev with rel-7.4. Please review the changed files before merging to prevent any errors that may occur. + branch: auto-merge/rel-8-0/${{github.run_number}} + title: Merge branch dev with rel-8.0 + body: This PR generated automatically to merge dev with rel-8.0. Please review the changed files before merging to prevent any errors that may occur. reviewers: ${{github.actor}} token: ${{ github.token }} - name: Merge Pull Request env: GH_TOKEN: ${{ secrets.BOT_SECRET }} run: | - gh pr review auto-merge/rel-7-4/${{github.run_number}} --approve - gh pr merge auto-merge/rel-7-4/${{github.run_number}} --merge --delete-branch \ No newline at end of file + gh pr review auto-merge/rel-8-0/${{github.run_number}} --approve + gh pr merge auto-merge/rel-8-0/${{github.run_number}} --merge --delete-branch