Browse Source

Merge pull request #18891 from abpframework/auto-merge/prerel-8-1/2452

Merge branch dev with prerel-8.1
pull/18896/head
maliming 2 years ago
committed by GitHub
parent
commit
cc2bab5311
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
  1. 20
      .github/workflows/auto-pr.yml

20
.github/workflows/auto-pr.yml

@ -1,13 +1,13 @@
name: Merge branch dev with rel-8.0 name: Merge branch dev with prerel-8.1
on: on:
push: push:
branches: branches:
- rel-8.0 - prerel-8.1
permissions: permissions:
contents: read contents: read
jobs: jobs:
merge-dev-with-rel-8-0: merge-dev-with-prerel-8-1:
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-8.0:rel-8.0 git fetch origin prerel-8.1:prerel-8.1
git reset --hard rel-8.0 git reset --hard prerel-8.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-8-0/${{github.run_number}} branch: auto-merge/prerel-8-1/${{github.run_number}}
title: Merge branch dev with rel-8.0 title: Merge branch dev with prerel-8.1
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. body: This PR generated automatically to merge dev with prerel-8.1. Please review the changed files before merging to prevent any errors that may occur.
reviewers: maliming reviewers: maliming
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-8-0/${{github.run_number}} --approve gh pr review auto-merge/prerel-8-1/${{github.run_number}} --approve
gh pr merge auto-merge/rel-8-0/${{github.run_number}} --merge --auto --delete-branch gh pr merge auto-merge/prerel-8-1/${{github.run_number}} --merge --auto --delete-branch

Loading…
Cancel
Save