Browse Source

Merge pull request #25528 from abpframework/skoc10-patch-2

Update workflow to merge rel-10.5 with rel-10.4
pull/25529/head
Volosoft Agent 4 months ago
committed by GitHub
parent
commit
6d8feb8de5
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
  1. 10
      .github/workflows/auto-pr.yml

10
.github/workflows/auto-pr.yml

@ -1,4 +1,4 @@
name: Merge branch dev with rel-10.4 name: Merge branch rel-10.5 with rel-10.4
on: on:
push: push:
branches: branches:
@ -7,7 +7,7 @@ permissions:
contents: read contents: read
jobs: jobs:
merge-dev-with-rel-10-4: merge-rel-10-5-with-rel-10-4:
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: rel-10.5
- name: Reset promotion branch - name: Reset promotion branch
run: | run: |
git fetch origin rel-10.4:rel-10.4 git fetch origin rel-10.4:rel-10.4
@ -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-10-4/${{github.run_number}} branch: auto-merge/rel-10-4/${{github.run_number}}
title: Merge branch dev with rel-10.4 title: Merge branch rel-10.5 with rel-10.4
body: This PR generated automatically to merge dev with rel-10.4. Please review the changed files before merging to prevent any errors that may occur. body: This PR generated automatically to merge rel-10.5 with rel-10.4. Please review the changed files before merging to prevent any errors that may occur.
draft: true draft: true
token: ${{ github.token }} token: ${{ github.token }}
- name: Merge Pull Request - name: Merge Pull Request

Loading…
Cancel
Save