From c37261f2811dd5304f24c5c576dfb9143f22f87b Mon Sep 17 00:00:00 2001 From: Mehmet Erim <34455572+mehmet-erim@users.noreply.github.com> Date: Wed, 30 Jun 2021 10:46:36 +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 86edede7d6..24d1abf88a 100644 --- a/.github/workflows/auto-pr.yml +++ b/.github/workflows/auto-pr.yml @@ -1,15 +1,15 @@ -name: Merge branch dev with rel-4.3 +name: Merge branch rel-4.4 with rel-4.3 on: push: branches: - rel-4.3 jobs: - merge-dev-with-rel-4-3: + merge-rel-4-4-with-rel-4-3: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 with: - ref: dev + ref: rel-4.4 - name: Reset promotion branch run: | git fetch origin rel-4.3:rel-4.3 @@ -18,7 +18,7 @@ jobs: uses: peter-evans/create-pull-request@v3 with: branch: auto-merge/rel-4-3/${{github.run_number}} - title: Merge branch dev with rel-4.3 - body: This PR generated automatically to merge dev with rel-4.3. Please review the changed files before merging to prevent any errors that may occur. + title: Merge branch rel-4.4 with rel-4.3 + body: This PR generated automatically to merge rel-4.4 with rel-4.3. Please review the changed files before merging to prevent any errors that may occur. reviewers: ${{github.actor}} token: ${{ github.token }} From 1fa1a031a1fabb75b22c2396839dac7f9acffb20 Mon Sep 17 00:00:00 2001 From: Mehmet Erim <34455572+mehmet-erim@users.noreply.github.com> Date: Wed, 30 Jun 2021 10:52:43 +0300 Subject: [PATCH 2/2] Update auto-pr.yml --- .github/workflows/auto-pr.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/auto-pr.yml b/.github/workflows/auto-pr.yml index 24d1abf88a..d4cd30c876 100644 --- a/.github/workflows/auto-pr.yml +++ b/.github/workflows/auto-pr.yml @@ -1,24 +1,24 @@ -name: Merge branch rel-4.4 with rel-4.3 +name: Merge branch dev with rel-4.4 on: push: branches: - - rel-4.3 + - rel-4.4 jobs: - merge-rel-4-4-with-rel-4-3: + merge-dev-with-rel-4-4: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 with: - ref: rel-4.4 + ref: dev - name: Reset promotion branch run: | - git fetch origin rel-4.3:rel-4.3 - git reset --hard rel-4.3 + git fetch origin rel-4.4:rel-4.4 + git reset --hard rel-4.4 - name: Create Pull Request uses: peter-evans/create-pull-request@v3 with: - branch: auto-merge/rel-4-3/${{github.run_number}} - title: Merge branch rel-4.4 with rel-4.3 - body: This PR generated automatically to merge rel-4.4 with rel-4.3. Please review the changed files before merging to prevent any errors that may occur. + branch: auto-merge/rel-4-4/${{github.run_number}} + title: Merge branch dev with rel-4.4 + body: This PR generated automatically to merge dev with rel-4.4. Please review the changed files before merging to prevent any errors that may occur. reviewers: ${{github.actor}} token: ${{ github.token }}