diff --git a/.github/workflows/auto-pr.yml b/.github/workflows/auto-pr.yml index cba64abd5d..434e65e031 100644 --- a/.github/workflows/auto-pr.yml +++ b/.github/workflows/auto-pr.yml @@ -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 diff --git a/common.props b/common.props index b1355eb36a..5daecfc488 100644 --- a/common.props +++ b/common.props @@ -1,8 +1,8 @@ latest - 9.2.0-preview - 4.2.0-preview + 9.2.0-rc.1Version> + 4.2.0-rc.1 $(NoWarn);CS1591;CS0436 https://abp.io/assets/abp_nupkg.png https://abp.io/