mirror of https://github.com/abpframework/abp.git
committed by
GitHub
1 changed files with 7 additions and 7 deletions
@ -1,24 +1,24 @@ |
|||||
name: Merge branch dev with rel-4.1 |
name: Merge branch rel-4.2 with rel-4.1 |
||||
on: |
on: |
||||
push: |
push: |
||||
branches: |
branches: |
||||
- rel-4.1 |
- rel-4.1 |
||||
jobs: |
jobs: |
||||
merge-dev-with-rel-4-1: |
merge-rel-4-2-with-rel-4-1: |
||||
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.2 |
||||
- name: Reset promotion branch |
- name: Reset promotion branch |
||||
run: | |
run: | |
||||
git fetch origin $GITHUB_REF:$GITHUB_REF |
git fetch origin rel-4.1:rel-4.1 |
||||
git reset --hard $GITHUB_REF |
git reset --hard rel-4.1 |
||||
- name: Create Pull Request |
- name: Create Pull Request |
||||
uses: peter-evans/create-pull-request@v3 |
uses: peter-evans/create-pull-request@v3 |
||||
with: |
with: |
||||
branch: auto-merge/rel-4-1/${{github.run_number}} |
branch: auto-merge/rel-4-1/${{github.run_number}} |
||||
title: Merge branch dev with rel-4.1 |
title: Merge branch rel-4.2 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. |
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}} |
reviewers: ${{github.actor}} |
||||
token: ${{ github.token }} |
token: ${{ github.token }} |
||||
|
|||||
Loading…
Reference in new issue