Browse Source

Merge pull request #23819 from abpframework/auto-merge/rel-10-0/3992

Merge branch dev with rel-10.0
pull/23823/head
Ma Liming 1 year ago
committed by GitHub
parent
commit
5dc323a1a9
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-9.3
name: Merge branch dev with rel-10.0
on:
push:
branches:
- rel-9.3
- rel-10.0
permissions:
contents: read
jobs:
merge-dev-with-rel-9-3:
merge-dev-with-rel-10-0:
permissions:
contents: write # for peter-evans/create-pull-request to create branch
pull-requests: write # for peter-evans/create-pull-request to create a PR
@ -18,14 +18,14 @@ jobs:
ref: dev
- name: Reset promotion branch
run: |
git fetch origin rel-9.3:rel-9.3
git reset --hard rel-9.3
git fetch origin rel-10.0:rel-10.0
git reset --hard rel-10.0
- name: Create Pull Request
uses: peter-evans/create-pull-request@v3
with:
branch: auto-merge/rel-9-3/${{github.run_number}}
title: Merge branch dev with rel-9.3
body: This PR generated automatically to merge dev with rel-9.3. Please review the changed files before merging to prevent any errors that may occur.
branch: auto-merge/rel-10-0/${{github.run_number}}
title: Merge branch dev with rel-10.0
body: This PR generated automatically to merge dev with rel-10.0. Please review the changed files before merging to prevent any errors that may occur.
reviewers: maliming
draft: true
token: ${{ github.token }}
@ -34,5 +34,5 @@ jobs:
GH_TOKEN: ${{ secrets.BOT_SECRET }}
run: |
gh pr ready
gh pr review auto-merge/rel-9-3/${{github.run_number}} --approve
gh pr merge auto-merge/rel-9-3/${{github.run_number}} --merge --auto --delete-branch
gh pr review auto-merge/rel-10-0/${{github.run_number}} --approve
gh pr merge auto-merge/rel-10-0/${{github.run_number}} --merge --auto --delete-branch

Loading…
Cancel
Save