Skip to content

Commit

Permalink
Merge pull request #18889 from abpframework/update-autho-pr
Browse files Browse the repository at this point in the history
Update auto-pr.yml for branch prerel-8.1
  • Loading branch information
maliming authored Jan 30, 2024
2 parents 280ef5a + 183d66d commit 7de3fa8
Showing 1 changed file with 10 additions and 10 deletions.
20 changes: 10 additions & 10 deletions .github/workflows/auto-pr.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
name: Merge branch dev with rel-8.0
name: Merge branch dev with prerel-8.1
on:
push:
branches:
- rel-8.0
- prerel-8.1
permissions:
contents: read

jobs:
merge-dev-with-rel-8-0:
merge-dev-with-prerel-8-1:
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
Expand All @@ -18,19 +18,19 @@ jobs:
ref: dev
- name: Reset promotion branch
run: |
git fetch origin rel-8.0:rel-8.0
git reset --hard rel-8.0
git fetch origin prerel-8.1:prerel-8.1
git reset --hard prerel-8.1
- name: Create Pull Request
uses: peter-evans/create-pull-request@v3
with:
branch: auto-merge/rel-8-0/${{github.run_number}}
title: Merge branch dev with rel-8.0
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.
branch: auto-merge/prerel-8-1/${{github.run_number}}
title: Merge branch dev with prerel-8.1
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
token: ${{ github.token }}
- name: Merge Pull Request
env:
GH_TOKEN: ${{ secrets.BOT_SECRET }}
run: |
gh pr review auto-merge/rel-8-0/${{github.run_number}} --approve
gh pr merge auto-merge/rel-8-0/${{github.run_number}} --merge --auto --delete-branch
gh pr review auto-merge/prerel-8-1/${{github.run_number}} --approve
gh pr merge auto-merge/prerel-8-1/${{github.run_number}} --merge --auto --delete-branch

0 comments on commit 7de3fa8

Please sign in to comment.