Browse Source

Merge pull request #21005 from abpframework/skoc10-patch-1

Update auto-pr.yml for prerel-9.0
pull/21006/head
selman koc 2 years ago
committed by GitHub
parent
commit
87c398f835
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
  1. 22
      .github/workflows/auto-pr.yml

22
.github/workflows/auto-pr.yml

@ -1,13 +1,13 @@
name: Merge branch prerel-9.0 with rel-8.3 name: Merge branch dev with prerel-9.0
on: on:
push: push:
branches: branches:
- rel-8.3 - prerel-9.0
permissions: permissions:
contents: read contents: read
jobs: jobs:
merge-prerel-9-0-with-rel-8-3: merge-dev-with-prerel-9-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
@ -15,22 +15,22 @@ jobs:
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
with: with:
ref: prerel-9.0 ref: dev
- name: Reset promotion branch - name: Reset promotion branch
run: | run: |
git fetch origin rel-8.3:rel-8.3 git fetch origin prerel-9.0:prerel-9.0
git reset --hard rel-8.3 git reset --hard prerel-9.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-8-3/${{github.run_number}} branch: auto-merge/prerel-9-0/${{github.run_number}}
title: Merge branch prerel-9.0 with rel-8.3 title: Merge branch dev with prerel-9.0
body: This PR generated automatically to merge prerel-9.0 with rel-8.3. Please review the changed files before merging to prevent any errors that may occur. body: This PR generated automatically to merge dev with prerel-9.0. 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-3/${{github.run_number}} --approve gh pr review auto-merge/prerel-9-0/${{github.run_number}} --approve
gh pr merge auto-merge/rel-8-3/${{github.run_number}} --merge --auto --delete-branch gh pr merge auto-merge/prerel-9-0/${{github.run_number}} --merge --auto --delete-branch

Loading…
Cancel
Save