-
Notifications
You must be signed in to change notification settings - Fork 3.4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'rel-8.2' into auto-merge/rel-8-1/2730
- Loading branch information
Showing
1,030 changed files
with
36,811 additions
and
30,080 deletions.
There are no files selected for viewing
This file contains 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
This file contains 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,36 +1,36 @@ | ||
| name: Merge branch rel-8.2 with rel-8.1 | ||
| name: Merge branch dev with rel-8.2 | ||
| on: | ||
| push: | ||
| branches: | ||
| - rel-8.1 | ||
| - rel-8.2 | ||
| permissions: | ||
| contents: read | ||
|
|
||
| jobs: | ||
| merge-rel-8-2-with-rel-8-1: | ||
| merge-dev-with-rel-8-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 | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - uses: actions/checkout@v2 | ||
| with: | ||
| ref: rel-8.2 | ||
| ref: dev | ||
| - name: Reset promotion branch | ||
| run: | | ||
| git fetch origin rel-8.1:rel-8.1 | ||
| git reset --hard rel-8.1 | ||
| git fetch origin rel-8.2:rel-8.2 | ||
| git reset --hard rel-8.2 | ||
| - name: Create Pull Request | ||
| uses: peter-evans/create-pull-request@v3 | ||
| with: | ||
| branch: auto-merge/rel-8-1/${{github.run_number}} | ||
| title: Merge branch rel-8.2 with rel-8.1 | ||
| body: This PR generated automatically to merge rel-8.2 with rel-8.1. Please review the changed files before merging to prevent any errors that may occur. | ||
| branch: auto-merge/rel-8-2/${{github.run_number}} | ||
| title: Merge branch dev with rel-8.2 | ||
| body: This PR generated automatically to merge dev with rel-8.2. Please review the changed files before merging to prevent any errors that may occur. | ||
| reviewers: maliming | ||
| token: ${{ github.token }} | ||
| - name: Merge Pull Request | ||
| env: | ||
| GH_TOKEN: ${{ secrets.BOT_SECRET }} | ||
| run: | | ||
| gh pr review auto-merge/rel-8-1/${{github.run_number}} --approve | ||
| gh pr merge auto-merge/rel-8-1/${{github.run_number}} --merge --auto --delete-branch | ||
| gh pr review auto-merge/rel-8-2/${{github.run_number}} --approve | ||
| gh pr merge auto-merge/rel-8-2/${{github.run_number}} --merge --auto --delete-branch |
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
Oops, something went wrong.