Browse Source
Merge pull request #22444 from abpframework/auto-merge/rel-9-2/3552
Merge branch dev with rel-9.2
pull/22453/head
maliming
1 year ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with
12 additions and
12 deletions
-
.github/workflows/auto-pr.yml
-
common.props
|
|
|
@ -1,13 +1,13 @@ |
|
|
|
name: Merge branch dev with rel-9.1 |
|
|
|
name: Merge branch dev with rel-9.2 |
|
|
|
on: |
|
|
|
push: |
|
|
|
branches: |
|
|
|
- rel-9.1 |
|
|
|
- rel-9.2 |
|
|
|
permissions: |
|
|
|
contents: read |
|
|
|
|
|
|
|
jobs: |
|
|
|
merge-dev-with-rel-9-1: |
|
|
|
merge-dev-with-rel-9-2: |
|
|
|
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-9.1:rel-9.1 |
|
|
|
git reset --hard rel-9.1 |
|
|
|
git fetch origin rel-9.2:rel-9.2 |
|
|
|
git reset --hard rel-9.2 |
|
|
|
- name: Create Pull Request |
|
|
|
uses: peter-evans/create-pull-request@v3 |
|
|
|
with: |
|
|
|
branch: auto-merge/rel-9-1/${{github.run_number}} |
|
|
|
title: Merge branch dev with rel-9.1 |
|
|
|
body: This PR generated automatically to merge dev with rel-9.1. Please review the changed files before merging to prevent any errors that may occur. |
|
|
|
branch: auto-merge/rel-9-2/${{github.run_number}} |
|
|
|
title: Merge branch dev with rel-9.2 |
|
|
|
body: This PR generated automatically to merge dev with rel-9.2. Please review the changed files before merging to prevent any errors that may occur. |
|
|
|
reviewers: maliming |
|
|
|
draft: true |
|
|
|
token: ${{ github.token }} |
|
|
|
@ -34,5 +34,5 @@ jobs: |
|
|
|
GH_TOKEN: ${{ secrets.BOT_SECRET }} |
|
|
|
run: | |
|
|
|
gh pr ready |
|
|
|
gh pr review auto-merge/rel-9-1/${{github.run_number}} --approve |
|
|
|
gh pr merge auto-merge/rel-9-1/${{github.run_number}} --merge --auto --delete-branch |
|
|
|
gh pr review auto-merge/rel-9-2/${{github.run_number}} --approve |
|
|
|
gh pr merge auto-merge/rel-9-2/${{github.run_number}} --merge --auto --delete-branch |
|
|
|
|
|
|
|
@ -1,8 +1,8 @@ |
|
|
|
<Project> |
|
|
|
<PropertyGroup> |
|
|
|
<LangVersion>latest</LangVersion> |
|
|
|
<Version>9.2.0-preview</Version> |
|
|
|
<LeptonXVersion>4.2.0-preview</LeptonXVersion> |
|
|
|
<Version>9.2.0-rc.1Version> |
|
|
|
<LeptonXVersion>4.2.0-rc.1</LeptonXVersion> |
|
|
|
<NoWarn>$(NoWarn);CS1591;CS0436</NoWarn> |
|
|
|
<PackageIconUrl>https://abp.io/assets/abp_nupkg.png</PackageIconUrl> |
|
|
|
<PackageProjectUrl>https://abp.io/</PackageProjectUrl> |
|
|
|
|