From 5e252c638c9b69502cd760c118df31869b313b29 Mon Sep 17 00:00:00 2001 From: Mehmet Erim <34455572+mehmet-erim@users.noreply.github.com> Date: Tue, 11 Jan 2022 15:47:55 +0300 Subject: [PATCH 1/2] 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 533fbb878e..d524dbc519 100644 --- a/.github/workflows/auto-pr.yml +++ b/.github/workflows/auto-pr.yml @@ -1,15 +1,15 @@ -name: Merge branch dev with rel-5.0 +name: Merge branch rel-5.1 with rel-5.0 on: push: branches: - rel-5.0 jobs: - merge-dev-with-rel-5-0: + merge-rel-5-1-with-rel-5-0: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 with: - ref: dev + ref: rel-5.1 - name: Reset promotion branch run: | git fetch origin rel-5.0:rel-5.0 @@ -18,7 +18,7 @@ jobs: uses: peter-evans/create-pull-request@v3 with: branch: auto-merge/rel-5-0/${{github.run_number}} - title: Merge branch dev with rel-5.0 - body: This PR generated automatically to merge dev with rel-5.0. Please review the changed files before merging to prevent any errors that may occur. + title: Merge branch rel-5.1 with rel-5.0 + body: This PR generated automatically to merge rel-5.1 with rel-5.0. Please review the changed files before merging to prevent any errors that may occur. reviewers: ${{github.actor}} token: ${{ github.token }} From ceba7cac07a317b6a58872ad4a7bee23f1ce2cf2 Mon Sep 17 00:00:00 2001 From: Mehmet Erim <34455572+mehmet-erim@users.noreply.github.com> Date: Tue, 11 Jan 2022 15:50:47 +0300 Subject: [PATCH 2/2] Update auto-pr.yml --- .github/workflows/auto-pr.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/auto-pr.yml b/.github/workflows/auto-pr.yml index c73819de4b..71b6bea747 100644 --- a/.github/workflows/auto-pr.yml +++ b/.github/workflows/auto-pr.yml @@ -9,7 +9,7 @@ jobs: steps: - uses: actions/checkout@v2 with: - ref: rel-5.1 + ref: dev - name: Reset promotion branch run: | git fetch origin rel-5.1:rel-5.1