Merge pull request #8287 from abpframework/auto-merge/rel-4-2/183

Merge branch rel-4.3 with rel-4.2
pull/8290/head^2
Mehmet Erim 5 years ago committed by GitHub
commit 55fbf332c0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -1,10 +1,10 @@
name: Merge branch dev with rel-4.2 name: Merge branch dev with rel-4.3
on: on:
push: push:
branches: branches:
- rel-4.2 - rel-4.3
jobs: jobs:
merge-dev-with-rel-4-2: merge-dev-with-rel-4-3:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
@ -12,13 +12,13 @@ jobs:
ref: dev ref: dev
- name: Reset promotion branch - name: Reset promotion branch
run: | run: |
git fetch origin rel-4.2:rel-4.2 git fetch origin rel-4.3:rel-4.3
git reset --hard rel-4.2 git reset --hard rel-4.3
- 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-2/${{github.run_number}} branch: auto-merge/rel-4-3/${{github.run_number}}
title: Merge branch dev with rel-4.2 title: Merge branch dev with rel-4.3
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 dev with rel-4.3. 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…
Cancel
Save