Browse Source

Merge pull request #25766 from abpframework/auto-merge/rel-10-6/4695

Merge branch dev with rel-10.6
pull/25767/head
Volosoft Agent 4 weeks ago
committed by GitHub
parent
commit
2c773802f0
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
  1. 20
      .github/workflows/auto-pr.yml
  2. 4
      common.props

20
.github/workflows/auto-pr.yml

@ -1,13 +1,13 @@
name: Merge branch dev with rel-10.5
name: Merge branch dev with rel-10.6
on:
push:
branches:
- rel-10.5
- rel-10.6
permissions:
contents: read
jobs:
merge-dev-with-rel-10-5:
merge-dev-with-rel-10-6:
permissions:
contents: write # for peter-evans/create-pull-request to create branch
pull-requests: write # for peter-evans/create-pull-request to create a PR
@ -18,14 +18,14 @@ jobs:
ref: dev
- name: Reset promotion branch
run: |
git fetch origin rel-10.5:rel-10.5
git reset --hard rel-10.5
git fetch origin rel-10.6:rel-10.6
git reset --hard rel-10.6
- name: Create Pull Request
uses: peter-evans/create-pull-request@v3
with:
branch: auto-merge/rel-10-5/${{github.run_number}}
title: Merge branch dev with rel-10.5
body: This PR generated automatically to merge dev with rel-10.5. Please review the changed files before merging to prevent any errors that may occur.
branch: auto-merge/rel-10-6/${{github.run_number}}
title: Merge branch dev with rel-10.6
body: This PR generated automatically to merge dev with rel-10.6. Please review the changed files before merging to prevent any errors that may occur.
draft: true
token: ${{ github.token }}
- name: Merge Pull Request
@ -33,5 +33,5 @@ jobs:
GH_TOKEN: ${{ secrets.BOT_SECRET }}
run: |
gh pr ready
gh pr review auto-merge/rel-10-5/${{github.run_number}} --approve
gh pr merge auto-merge/rel-10-5/${{github.run_number}} --merge --auto --delete-branch
gh pr review auto-merge/rel-10-6/${{github.run_number}} --approve
gh pr merge auto-merge/rel-10-6/${{github.run_number}} --merge --auto --delete-branch

4
common.props

@ -1,8 +1,8 @@
<Project>
<PropertyGroup>
<LangVersion>latest</LangVersion>
<Version>10.6.0-preview</Version>
<LeptonXVersion>5.6.0-preview</LeptonXVersion>
<Version>10.6.0-rc.1</Version>
<LeptonXVersion>5.6.0-rc.1</LeptonXVersion>
<NoWarn>$(NoWarn);CS1591;CS0436</NoWarn>
<PackageIconUrl>https://abp.io/assets/abp_nupkg.png</PackageIconUrl>
<PackageProjectUrl>https://abp.io/</PackageProjectUrl>

Loading…
Cancel
Save