Browse Source

Update GitHub Actions workflow for branch merging

pull/24509/head
selman koc 1 month ago
committed by GitHub
parent
commit
7be2bfa46e
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 rel-10.1 with rel-10.0 name: Merge branch dev with rel-10.1
on: on:
push: push:
branches: branches:
- rel-10.0 - rel-10.1
permissions: permissions:
contents: read contents: read
jobs: jobs:
merge-rel-10-1-with-rel-10-0: merge-dev-with-rel-10-1:
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,17 +15,17 @@ jobs:
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
with: with:
ref: rel-10.1 ref: dev
- name: Reset promotion branch - name: Reset promotion branch
run: | run: |
git fetch origin rel-10.0:rel-10.0 git fetch origin rel-10.1:rel-10.1
git reset --hard rel-10.0 git reset --hard rel-10.1
- 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-10-0/${{github.run_number}} branch: auto-merge/rel-10-1/${{github.run_number}}
title: Merge branch rel-10.1 with rel-10.0 title: Merge branch dev with rel-10.1
body: This PR generated automatically to merge rel-10.1 with rel-10.0. Please review the changed files before merging to prevent any errors that may occur. body: This PR generated automatically to merge dev with rel-10.1. 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-10-0/${{github.run_number}} --approve gh pr review auto-merge/rel-10-1/${{github.run_number}} --approve
gh pr merge auto-merge/rel-10-0/${{github.run_number}} --merge --auto --delete-branch gh pr merge auto-merge/rel-10-1/${{github.run_number}} --merge --auto --delete-branch

Loading…
Cancel
Save