[skip ci] Update CHANGELOG (#1909)

* [skip ci] Update CHANGELOG

Signed-off-by: jinhai <hai.jin@zilliz.com>

* [skip ci] update auto merge

Signed-off-by: jinhai <hai.jin@zilliz.com>
pull/1937/head
Jin Hai 2020-04-17 11:45:22 +08:00 committed by GitHub
parent f33ba8f8c9
commit 6b106cbef1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 13 deletions

View File

@ -1,4 +1,4 @@
name: automerge
name: Automerge
on:
pull_request:
types:
@ -13,24 +13,15 @@ on:
pull_request_review:
types:
- submitted
check_suite:
types:
- completed
status: {}
jobs:
automerge:
runs-on: ubuntu-latest
steps:
- name: Merge pull requests
uses: pascalgn/automerge-action@v0.8.0
- name: automerge
uses: "pascalgn/automerge-action@629929da409181990e4e638dcf84a74e11d3af66"
env:
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
MERGE_LABELS: "automerge,!work in progress"
MERGE_REMOVE_LABELS: "automerge"
MERGE_METHOD: "squash"
MERGE_COMMIT_MESSAGE: "pull-request-description"
MERGE_FORKS: "true"
MERGE_RETRIES: "6"
MERGE_RETRY_SLEEP: "10000"
UPDATE_LABELS: ""
UPDATE_METHOD: "merge"
MERGE_COMMIT_MESSAGE: "pull-request-title"