Browse Source

Merge pull request #15631 from abpframework/auto-merge/rel-7-1/1705

Merge branch dev with rel-7.1
pull/15633/head
Muhammed Altuğ 4 years ago
committed by GitHub
parent
commit
3e52269db4
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 16
      .github/workflows/auto-pr.yml
  2. 2
      common.props

16
.github/workflows/auto-pr.yml

@ -1,13 +1,13 @@
name: Merge branch dev with rel-7.0 name: Merge branch dev with rel-7.1
on: on:
push: push:
branches: branches:
- rel-7.0 - rel-7.1
permissions: permissions:
contents: read contents: read
jobs: jobs:
merge-dev-with-rel-6-0: merge-dev-with-rel-7-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
@ -18,13 +18,13 @@ jobs:
ref: dev ref: dev
- name: Reset promotion branch - name: Reset promotion branch
run: | run: |
git fetch origin rel-7.0:rel-7.0 git fetch origin rel-7.1:rel-7.1
git reset --hard rel-7.0 git reset --hard rel-7.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-7-0/${{github.run_number}} branch: auto-merge/rel-7-1/${{github.run_number}}
title: Merge branch dev with rel-7.0 title: Merge branch dev with rel-7.1
body: This PR generated automatically to merge dev with rel-7.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-7.1. Please review the changed files before merging to prevent any errors that may occur.
reviewers: ${{github.actor}} reviewers: ${{github.actor}}
token: ${{ github.token }} token: ${{ github.token }}

2
common.props

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

Loading…
Cancel
Save