From 616a02ad63c3534762415286b4f2163d34e95635 Mon Sep 17 00:00:00 2001 From: Mehmet Erim <34455572+mehmet-erim@users.noreply.github.com> Date: Thu, 14 Jan 2021 11:58:24 +0300 Subject: [PATCH] Update auto-pr.yml --- .github/workflows/auto-pr.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/auto-pr.yml b/.github/workflows/auto-pr.yml index c8e8663069..83ca4e55fc 100644 --- a/.github/workflows/auto-pr.yml +++ b/.github/workflows/auto-pr.yml @@ -1,24 +1,24 @@ -name: Merge branch dev with rel-4.1 +name: Merge branch rel-4.2 with rel-4.1 on: push: branches: - rel-4.1 jobs: - merge-dev-with-rel-4-1: + merge-rel-4-2-with-rel-4-1: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 with: - ref: dev + ref: rel-4.2 - name: Reset promotion branch run: | - git fetch origin $GITHUB_REF:$GITHUB_REF - git reset --hard $GITHUB_REF + git fetch origin rel-4.1:rel-4.1 + git reset --hard rel-4.1 - name: Create Pull Request uses: peter-evans/create-pull-request@v3 with: branch: auto-merge/rel-4-1/${{github.run_number}} - title: Merge branch dev with rel-4.1 - body: This PR generated automatically to merge dev with rel-4.1. Please review the changed files before merging to prevent any errors that may occur. + title: Merge branch rel-4.2 with rel-4.1 + body: This PR generated automatically to merge rel-4.2 with rel-4.1. Please review the changed files before merging to prevent any errors that may occur. reviewers: ${{github.actor}} token: ${{ github.token }}