@ -1,15 +1,15 @@
name : Merge branch dev with rel-4.2
name : Merge branch rel-4.3 with rel-4.2
on :
on :
push:
push:
branches:
branches:
- rel-4.2
- rel-4.2
jobs:
jobs:
merge- dev -with-rel-4-2:
merge- rel-4-3 -with-rel-4-2:
runs-on : ubuntu-latest
runs-on : ubuntu-latest
steps:
steps:
- uses : actions/checkout@v2
- uses : actions/checkout@v2
with:
with:
ref : dev
ref : rel-4.3
- name : Reset promotion branch
- name : Reset promotion branch
run : |
run : |
git fetch origin rel-4.2:rel-4.2
git fetch origin rel-4.2:rel-4.2
@ -18,7 +18,7 @@ jobs:
uses : peter-evans/create-pull-request@v3
uses : peter-evans/create-pull-request@v3
with:
with:
branch : auto-merge/rel-4-2/${{github.run_number}}
branch : auto-merge/rel-4-2/${{github.run_number}}
title : Merge branch dev with rel-4.2
title : Merge branch rel-4.3 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.
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}}
reviewers : ${{github.actor}}
token : ${{ github.token }}
token : ${{ github.token }}