Browse Source

Merge pull request #23083 from abpframework/auto-merge/rel-9-3/3783

Merge branch dev with rel-9.3
pull/23086/head
maliming 1 year ago
committed by GitHub
parent
commit
23d633c161
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.2 name: Merge branch dev with rel-9.3
on: on:
push: push:
branches: branches:
- rel-9.2 - rel-9.3
permissions: permissions:
contents: read contents: read
jobs: jobs:
merge-dev-with-rel-9-2: merge-dev-with-rel-9-3:
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,14 +18,14 @@ jobs:
ref: dev ref: dev
- name: Reset promotion branch - name: Reset promotion branch
run: | run: |
git fetch origin rel-9.2:rel-9.2 git fetch origin rel-9.3:rel-9.3
git reset --hard rel-9.2 git reset --hard rel-9.3
- 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-9-2/${{github.run_number}} branch: auto-merge/rel-9-3/${{github.run_number}}
title: Merge branch dev with rel-9.2 title: Merge branch dev with rel-9.3
body: This PR generated automatically to merge dev with rel-9.2. Please review the changed files before merging to prevent any errors that may occur. 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.
reviewers: maliming reviewers: maliming
draft: true draft: true
token: ${{ github.token }} token: ${{ github.token }}
@ -34,5 +34,5 @@ jobs:
GH_TOKEN: ${{ secrets.BOT_SECRET }} GH_TOKEN: ${{ secrets.BOT_SECRET }}
run: | run: |
gh pr ready gh pr ready
gh pr review auto-merge/rel-9-2/${{github.run_number}} --approve gh pr review auto-merge/rel-9-3/${{github.run_number}} --approve
gh pr merge auto-merge/rel-9-2/${{github.run_number}} --merge --auto --delete-branch gh pr merge auto-merge/rel-9-3/${{github.run_number}} --merge --auto --delete-branch

Loading…
Cancel
Save