Browse Source
Merge pull request #14631 from abpframework/auto-merge/rel-6-0/1443
Merge branch rel-7.0 with rel-6.0
pull/14633/head
Muhammed Altuğ
4 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with
4 additions and
4 deletions
.github/workflows/auto-pr.yml
@ -1,4 +1,4 @@
name : Merge branch dev with rel-6.0
name : Merge branch rel-7.0 with rel-6.0
on :
on :
push:
push:
branches:
branches:
@ -15,7 +15,7 @@ jobs:
steps:
steps:
- uses : actions/checkout@v2
- uses : actions/checkout@v2
with:
with:
ref : dev
ref : rel-7.0
- name : Reset promotion branch
- name : Reset promotion branch
run : |
run : |
git fetch origin rel-6.0:rel-6.0
git fetch origin rel-6.0:rel-6.0
@ -24,7 +24,7 @@ jobs:
uses : peter-evans/create-pull-request@v3
uses : peter-evans/create-pull-request@v3
with:
with:
branch : auto-merge/rel-6-0/${{github.run_number}}
branch : auto-merge/rel-6-0/${{github.run_number}}
title : Merge branch dev with rel-6.0
title : Merge branch rel-7.0 with rel-6.0
body : This PR generated automatically to merge dev with rel-6.0. Please review the changed files before merging to prevent any errors that may occur.
body : This PR generated automatically to merge rel-7.0 with rel-6.0. 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 }}