diff --git a/.github/workflows/auto-pr.yml b/.github/workflows/auto-pr.yml index 083ccc554c..1babddae5a 100644 --- a/.github/workflows/auto-pr.yml +++ b/.github/workflows/auto-pr.yml @@ -1,13 +1,13 @@ -name: Merge branch rel-7.1 with rel-7.0 +name: Merge branch dev with rel-7.1 on: push: branches: - - rel-7.0 + - rel-7.1 permissions: contents: read jobs: - merge-rel-7-1-with-rel-7-0: + merge-dev-with-rel-7-1: 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,16 +15,16 @@ jobs: steps: - uses: actions/checkout@v2 with: - ref: rel-7.1 + ref: dev - name: Reset promotion branch run: | - git fetch origin rel-7.0:rel-7.0 - git reset --hard rel-7.0 + git fetch origin rel-7.1:rel-7.1 + git reset --hard rel-7.1 - name: Create Pull Request uses: peter-evans/create-pull-request@v3 with: - branch: auto-merge/rel-7-0/${{github.run_number}} - title: Merge branch rel-7.1 with rel-7.0 - body: This PR generated automatically to merge rel-7.1 with rel-7.0. Please review the changed files before merging to prevent any errors that may occur. + branch: auto-merge/rel-7-1/${{github.run_number}} + title: Merge branch dev with rel-7.1 + body: This PR generated automatically to merge dev with rel-7.1. Please review the changed files before merging to prevent any errors that may occur. reviewers: ${{github.actor}} token: ${{ github.token }}