Merge pull request #25630 from abpframework/maliming/fix-identityserv… #4655
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| name: Merge branch dev with rel-10.5 | |
| on: | |
| push: | |
| branches: | |
| - rel-10.5 | |
| permissions: | |
| contents: read | |
| jobs: | |
| merge-dev-with-rel-10-5: | |
| 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 | |
| runs-on: ubuntu-latest | |
| steps: | |
| - uses: actions/checkout@v2 | |
| with: | |
| ref: dev | |
| - name: Reset promotion branch | |
| run: | | |
| git fetch origin rel-10.5:rel-10.5 | |
| git reset --hard rel-10.5 | |
| - 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. | |
| draft: true | |
| token: ${{ github.token }} | |
| - name: Merge Pull Request | |
| env: | |
| 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 |