From a8a540ceb11c640149404a33f5e8b314d769ae71 Mon Sep 17 00:00:00 2001 From: Erol Arkat Date: Wed, 31 Mar 2021 14:04:41 +0300 Subject: [PATCH 1/4] version update --- common.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common.props b/common.props index 593fe92213..b04a8af9cc 100644 --- a/common.props +++ b/common.props @@ -1,7 +1,7 @@ latest - 4.3.0 + 4.3.0-rc.1 $(NoWarn);CS1591;CS0436 https://abp.io/assets/abp_nupkg.png https://abp.io/ From e100b9a112cd9c66f47c44cbdddcefcf17041f94 Mon Sep 17 00:00:00 2001 From: Mehmet Erim <34455572+mehmet-erim@users.noreply.github.com> Date: Wed, 31 Mar 2021 17:24:22 +0300 Subject: [PATCH 2/4] Update auto-pr.yml resolves https://github.com/volosoft/volo/issues/6059 --- .github/workflows/auto-pr.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/auto-pr.yml b/.github/workflows/auto-pr.yml index be8ad519d4..1f0df2b559 100644 --- a/.github/workflows/auto-pr.yml +++ b/.github/workflows/auto-pr.yml @@ -1,15 +1,15 @@ -name: Merge branch dev with rel-4.2 +name: Merge branch rel-4.3 with rel-4.2 on: push: branches: - rel-4.2 jobs: - merge-dev-with-rel-4-2: + merge-rel-4-3-with-rel-4-2: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 with: - ref: dev + ref: rel-4.3 - name: Reset promotion branch run: | git fetch origin rel-4.2:rel-4.2 @@ -18,7 +18,7 @@ jobs: uses: peter-evans/create-pull-request@v3 with: branch: auto-merge/rel-4-2/${{github.run_number}} - title: Merge branch dev with rel-4.2 - body: This PR generated automatically to merge dev with rel-4.2. Please review the changed files before merging to prevent any errors that may occur. + title: Merge branch rel-4.3 with rel-4.2 + body: This PR generated automatically to merge rel-4.3 with rel-4.2. Please review the changed files before merging to prevent any errors that may occur. reviewers: ${{github.actor}} token: ${{ github.token }} From d4f4cf1d8cad87453a74d6e4c80e8e83a0a051cf Mon Sep 17 00:00:00 2001 From: Mehmet Erim <34455572+mehmet-erim@users.noreply.github.com> Date: Wed, 31 Mar 2021 17:28:05 +0300 Subject: [PATCH 3/4] Update auto-pr.yml --- .github/workflows/auto-pr.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/auto-pr.yml b/.github/workflows/auto-pr.yml index 1f0df2b559..86edede7d6 100644 --- a/.github/workflows/auto-pr.yml +++ b/.github/workflows/auto-pr.yml @@ -1,24 +1,24 @@ -name: Merge branch rel-4.3 with rel-4.2 +name: Merge branch dev with rel-4.3 on: push: branches: - - rel-4.2 + - rel-4.3 jobs: - merge-rel-4-3-with-rel-4-2: + merge-dev-with-rel-4-3: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 with: - ref: rel-4.3 + ref: dev - name: Reset promotion branch run: | - git fetch origin rel-4.2:rel-4.2 - git reset --hard rel-4.2 + git fetch origin rel-4.3:rel-4.3 + git reset --hard rel-4.3 - name: Create Pull Request uses: peter-evans/create-pull-request@v3 with: - branch: auto-merge/rel-4-2/${{github.run_number}} - title: Merge branch rel-4.3 with rel-4.2 - body: This PR generated automatically to merge rel-4.3 with rel-4.2. Please review the changed files before merging to prevent any errors that may occur. + branch: auto-merge/rel-4-3/${{github.run_number}} + title: Merge branch dev with rel-4.3 + body: This PR generated automatically to merge dev with rel-4.3. Please review the changed files before merging to prevent any errors that may occur. reviewers: ${{github.actor}} token: ${{ github.token }} From 35ca214f8f1c086a211396873a63e7e51682a92e Mon Sep 17 00:00:00 2001 From: Mehmet Erim <34455572+mehmet-erim@users.noreply.github.com> Date: Wed, 31 Mar 2021 17:30:05 +0300 Subject: [PATCH 4/4] Update common.props --- common.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common.props b/common.props index b04a8af9cc..987fa421a4 100644 --- a/common.props +++ b/common.props @@ -1,7 +1,7 @@ latest - 4.3.0-rc.1 + 4.4.0 $(NoWarn);CS1591;CS0436 https://abp.io/assets/abp_nupkg.png https://abp.io/