diff --git a/.github/workflows/create_github_release.yml b/.github/workflows/create_github_release.yml index 95e73815..f7ae5fcc 100644 --- a/.github/workflows/create_github_release.yml +++ b/.github/workflows/create_github_release.yml @@ -6,7 +6,7 @@ on: jobs: - build: + Create_GitHub_release: runs-on: ubuntu-latest steps: diff --git a/.github/workflows/create_pull_request.yml b/.github/workflows/create_pull_request.yml index e96085ad..cff80e9d 100644 --- a/.github/workflows/create_pull_request.yml +++ b/.github/workflows/create_pull_request.yml @@ -6,7 +6,7 @@ on: jobs: - build: + Create_pull_request: runs-on: ubuntu-latest steps: diff --git a/.github/workflows/merge_pull_request.yml b/.github/workflows/merge_pull_request.yml index 974082c1..c1d18cd4 100644 --- a/.github/workflows/merge_pull_request.yml +++ b/.github/workflows/merge_pull_request.yml @@ -6,7 +6,7 @@ on: jobs: - build: + Merge_pull_request: runs-on: ubuntu-latest steps: @@ -23,6 +23,18 @@ jobs: git push origin ${{ github.event.client_payload.ReleaseBranchName }}-docs sleep 30 + - name: Approve pull request by GitHub-Actions bot + uses: actions/github-script@v2 + with: + github-token: ${{secrets.GITHUB_TOKEN}} + script: | + github.pulls.createReview({ + owner: context.repo.owner, + repo: context.repo.repo, + pull_number: ${{ github.event.client_payload.PullRequestNumber }}, + event: "APPROVE" + }); + - name: Merge pull request for ${{ github.event.client_payload.ReleaseBranchName }} uses: actions/github-script@v2 with: @@ -31,7 +43,8 @@ jobs: github.pulls.merge({ owner: context.repo.owner, repo: context.repo.repo, - pull_number: ${{ github.event.client_payload.PullRequestNumber }} + pull_number: ${{ github.event.client_payload.PullRequestNumber }}, + merge_method: "squash" }) - name: Delete docs branch ${{ github.event.client_payload.ReleaseBranchName }}-docs diff --git a/.github/workflows/update_github_release.yml b/.github/workflows/update_github_release.yml index e6593ae9..0ea6d302 100644 --- a/.github/workflows/update_github_release.yml +++ b/.github/workflows/update_github_release.yml @@ -6,7 +6,7 @@ on: jobs: - build: + Update_GitHub_release: runs-on: ubuntu-latest steps: