Browse Source

Merge pull request #11257 from abpframework/maliming-patch-auto-pr

Update `auto-pr.yml` for `rel-5.1`.
pull/11259/head
Mehmet Erim 5 years ago
committed by GitHub
parent
commit
727bcafc4f
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 16
      .github/workflows/auto-pr.yml

16
.github/workflows/auto-pr.yml

@ -1,10 +1,10 @@
name: Merge branch dev with rel-5.0 name: Merge branch dev with rel-5.1
on: on:
push: push:
branches: branches:
- rel-5.0 - rel-5.1
jobs: jobs:
merge-dev-with-rel-5-0: merge-dev-with-rel-5-1:
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-5.0:rel-5.0 git fetch origin rel-5.1:rel-5.1
git reset --hard rel-5.0 git reset --hard rel-5.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-5-0/${{github.run_number}} branch: auto-merge/rel-5-1/${{github.run_number}}
title: Merge branch dev with rel-5.0 title: Merge branch dev with rel-5.1
body: This PR generated automatically to merge dev with rel-5.0. Please review the changed files before merging to prevent any errors that may occur. body: This PR generated automatically to merge dev with rel-5.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…
Cancel
Save