Browse Source

Merge pull request #15628 from abpframework/update-auto-pr-yml-for-70

Change auto-pr for 7.1
pull/15629/head
Muhammed Altuğ 4 years ago
committed by GitHub
parent
commit
99ac3c68fe
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 10
      .github/workflows/auto-pr.yml

10
.github/workflows/auto-pr.yml

@ -1,4 +1,4 @@
name: Merge branch dev with rel-7.0 name: Merge branch rel-7.1 with rel-7.0
on: on:
push: push:
branches: branches:
@ -7,7 +7,7 @@ permissions:
contents: read contents: read
jobs: jobs:
merge-dev-with-rel-6-0: merge-rel-7-1-with-rel-7-0:
permissions: permissions:
contents: write # for peter-evans/create-pull-request to create branch contents: write # for peter-evans/create-pull-request to create branch
pull-requests: write # for peter-evans/create-pull-request to create a PR pull-requests: write # for peter-evans/create-pull-request to create a PR
@ -15,7 +15,7 @@ jobs:
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
with: with:
ref: dev ref: rel-7.1
- name: Reset promotion branch - name: Reset promotion branch
run: | run: |
git fetch origin rel-7.0:rel-7.0 git fetch origin rel-7.0:rel-7.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-7-0/${{github.run_number}} branch: auto-merge/rel-7-0/${{github.run_number}}
title: Merge branch dev with rel-7.0 title: Merge branch rel-7.1 with rel-7.0
body: This PR generated automatically to merge dev with rel-7.0. Please review the changed files before merging to prevent any errors that may occur. body: This PR generated automatically to merge rel-7.1 with rel-7.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 }}

Loading…
Cancel
Save