From 0e6243d6b4bc7b533bac5301818ff6883c2c821a Mon Sep 17 00:00:00 2001 From: maliming Date: Tue, 21 Nov 2023 19:32:18 +0800 Subject: [PATCH] Update auto-pr.yml --- .github/workflows/auto-pr.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/auto-pr.yml b/.github/workflows/auto-pr.yml index 49a926d1a7..7e77ab0292 100644 --- a/.github/workflows/auto-pr.yml +++ b/.github/workflows/auto-pr.yml @@ -1,4 +1,4 @@ -name: Merge branch dev with rel-7.4 +name: Merge branch rel-8.0 with rel-7.4 on: push: branches: @@ -7,7 +7,7 @@ permissions: contents: read jobs: - merge-dev-with-rel-7-4: + merge-rel-8-0-with-rel-7-4: 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: rel-8.0 - name: Reset promotion branch run: | git fetch origin rel-7.4:rel-7.4 @@ -24,8 +24,8 @@ jobs: 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. + title: Merge branch rel-8.0 with rel-7.4 + body: This PR generated automatically to merge rel-8.0 with rel-7.4. Please review the changed files before merging to prevent any errors that may occur. reviewers: ${{github.actor}} token: ${{ github.token }} - name: Merge Pull Request