Browse Source

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

Update auto-pr.yml for prerel
pull/20226/head
SALİH ÖZKARA 2 years ago
committed by GitHub
parent
commit
1d39227653
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
  1. 12
      .github/workflows/auto-pr.yml

12
.github/workflows/auto-pr.yml

@ -1,4 +1,4 @@
name: Merge branch dev with rel-8.2 name: Merge branch prerel-8.3 with rel-8.2
on: on:
push: push:
branches: branches:
@ -7,7 +7,7 @@ permissions:
contents: read contents: read
jobs: jobs:
merge-dev-with-rel-8-2: merge-prerel-8-3-with-rel-8-2:
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,7 +15,7 @@ jobs:
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
with: with:
ref: dev ref: prerel-8.3
- name: Reset promotion branch - name: Reset promotion branch
run: | run: |
git fetch origin rel-8.2:rel-8.2 git fetch origin rel-8.2:rel-8.2
@ -24,8 +24,8 @@ jobs:
uses: peter-evans/create-pull-request@v3 uses: peter-evans/create-pull-request@v3
with: with:
branch: auto-merge/rel-8-2/${{github.run_number}} branch: auto-merge/rel-8-2/${{github.run_number}}
title: Merge branch dev with rel-8.2 title: Merge branch prerel-8.3 with rel-8.2
body: This PR generated automatically to merge dev with rel-8.2. Please review the changed files before merging to prevent any errors that may occur. body: This PR generated automatically to merge prerel-8.3 with rel-8.2. 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
@ -33,4 +33,4 @@ jobs:
GH_TOKEN: ${{ secrets.BOT_SECRET }} GH_TOKEN: ${{ secrets.BOT_SECRET }}
run: | run: |
gh pr review auto-merge/rel-8-2/${{github.run_number}} --approve gh pr review auto-merge/rel-8-2/${{github.run_number}} --approve
gh pr merge auto-merge/rel-8-2/${{github.run_number}} --merge --auto --delete-branch gh pr merge auto-merge/rel-8-2/${{github.run_number}} --merge --auto --delete-branch

Loading…
Cancel
Save