|
1 |
| -name: Merge branch rel-9-2 with rel-9.1 |
| 1 | +name: Merge branch dev with rel-9.2 |
2 | 2 | on:
|
3 | 3 | push:
|
4 | 4 | branches:
|
5 |
| - - rel-9.1 |
| 5 | + - rel-9.2 |
6 | 6 | permissions:
|
7 | 7 | contents: read
|
8 | 8 |
|
9 | 9 | jobs:
|
10 |
| - merge-rel-9-2-with-rel-9-1: |
| 10 | + merge-dev-with-rel-9-2: |
11 | 11 | permissions:
|
12 | 12 | contents: write # for peter-evans/create-pull-request to create branch
|
13 | 13 | pull-requests: write # for peter-evans/create-pull-request to create a PR
|
14 | 14 | runs-on: ubuntu-latest
|
15 | 15 | steps:
|
16 | 16 | - uses: actions/checkout@v2
|
17 | 17 | with:
|
18 |
| - ref: rel-9.2 |
| 18 | + ref: dev |
19 | 19 | - name: Reset promotion branch
|
20 | 20 | run: |
|
21 |
| - git fetch origin rel-9.1:rel-9.1 |
22 |
| - git reset --hard rel-9.1 |
| 21 | + git fetch origin rel-9.2:rel-9.2 |
| 22 | + git reset --hard rel-9.2 |
23 | 23 | - name: Create Pull Request
|
24 | 24 | uses: peter-evans/create-pull-request@v3
|
25 | 25 | with:
|
26 |
| - branch: auto-merge/rel-9-1/${{github.run_number}} |
27 |
| - title: Merge branch rel-9.2 with rel-9.1 |
28 |
| - body: This PR generated automatically to merge rel-9.2 with rel-9.1. Please review the changed files before merging to prevent any errors that may occur. |
| 26 | + branch: auto-merge/rel-9-2/${{github.run_number}} |
| 27 | + title: Merge branch dev with rel-9.2 |
| 28 | + 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. |
29 | 29 | reviewers: maliming
|
30 | 30 | draft: true
|
31 | 31 | token: ${{ github.token }}
|
|
34 | 34 | GH_TOKEN: ${{ secrets.BOT_SECRET }}
|
35 | 35 | run: |
|
36 | 36 | gh pr ready
|
37 |
| - gh pr review auto-merge/rel-9-1/${{github.run_number}} --approve |
38 |
| - gh pr merge auto-merge/rel-9-1/${{github.run_number}} --merge --auto --delete-branch |
| 37 | + gh pr review auto-merge/rel-9-2/${{github.run_number}} --approve |
| 38 | + gh pr merge auto-merge/rel-9-2/${{github.run_number}} --merge --auto --delete-branch |
0 commit comments