Merge pull request #18210 from abpframework/maliming-patch-2

Update `auto-pr` for `rel-8.0`.
pull/18212/head
liangshiwei 2 years ago committed by GitHub
commit 5d608fee6b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -1,13 +1,13 @@
name: Merge branch dev with rel-7.4 name: Merge branch dev with rel-8.0
on: on:
push: push:
branches: branches:
- rel-7.4 - rel-8.0
permissions: permissions:
contents: read contents: read
jobs: jobs:
merge-dev-with-rel-7-4: merge-dev-with-rel-8-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
@ -18,19 +18,19 @@ jobs:
ref: dev ref: dev
- name: Reset promotion branch - name: Reset promotion branch
run: | run: |
git fetch origin rel-7.4:rel-7.4 git fetch origin rel-8.0:rel-8.0
git reset --hard rel-7.4 git reset --hard rel-8.0
- 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-7-4/${{github.run_number}} branch: auto-merge/rel-8-0/${{github.run_number}}
title: Merge branch dev with rel-7.4 title: Merge branch dev with rel-8.0
body: This PR generated automatically to merge dev with rel-7.4. Please review the changed files before merging to prevent any errors that may occur. body: This PR generated automatically to merge dev with rel-8.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 }}
- name: Merge Pull Request - name: Merge Pull Request
env: env:
GH_TOKEN: ${{ secrets.BOT_SECRET }} GH_TOKEN: ${{ secrets.BOT_SECRET }}
run: | run: |
gh pr review auto-merge/rel-7-4/${{github.run_number}} --approve gh pr review auto-merge/rel-8-0/${{github.run_number}} --approve
gh pr merge auto-merge/rel-7-4/${{github.run_number}} --merge --delete-branch gh pr merge auto-merge/rel-8-0/${{github.run_number}} --merge --delete-branch

Loading…
Cancel
Save