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