From e100b9a112cd9c66f47c44cbdddcefcf17041f94 Mon Sep 17 00:00:00 2001 From: Mehmet Erim <34455572+mehmet-erim@users.noreply.github.com> Date: Wed, 31 Mar 2021 17:24:22 +0300 Subject: [PATCH] Update auto-pr.yml resolves https://github.com/volosoft/volo/issues/6059 --- .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 be8ad519d4..1f0df2b559 100644 --- a/.github/workflows/auto-pr.yml +++ b/.github/workflows/auto-pr.yml @@ -1,15 +1,15 @@ -name: Merge branch dev with rel-4.2 +name: Merge branch rel-4.3 with rel-4.2 on: push: branches: - rel-4.2 jobs: - merge-dev-with-rel-4-2: + merge-rel-4-3-with-rel-4-2: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 with: - ref: dev + ref: rel-4.3 - name: Reset promotion branch run: | git fetch origin rel-4.2:rel-4.2 @@ -18,7 +18,7 @@ jobs: uses: peter-evans/create-pull-request@v3 with: branch: auto-merge/rel-4-2/${{github.run_number}} - title: Merge branch dev with rel-4.2 - body: This PR generated automatically to merge dev with rel-4.2. Please review the changed files before merging to prevent any errors that may occur. + title: Merge branch rel-4.3 with rel-4.2 + body: This PR generated automatically to merge rel-4.3 with rel-4.2. Please review the changed files before merging to prevent any errors that may occur. reviewers: ${{github.actor}} token: ${{ github.token }}