From ab60e7d491e07c00824275b746714de8066341c9 Mon Sep 17 00:00:00 2001 From: Christian Kotzbauer Date: Sat, 12 Dec 2020 12:45:57 +0100 Subject: [PATCH] change automerge policy Signed-off-by: Christian Kotzbauer --- .github/workflows/automerge.yml | 22 ++++------------------ 1 file changed, 4 insertions(+), 18 deletions(-) diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml index 355ae8c..41372ce 100644 --- a/.github/workflows/automerge.yml +++ b/.github/workflows/automerge.yml @@ -1,22 +1,7 @@ name: Merge PRs on: - pull_request: - types: - - labeled - - unlabeled - - synchronize - - opened - - edited - - ready_for_review - - reopened - - unlocked - pull_request_review: - types: - - submitted - check_suite: - types: - - completed - status: {} + schedule: + - cron: "0 */6 * * *" jobs: automerge: runs-on: ubuntu-latest @@ -26,5 +11,6 @@ jobs: env: GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}" MERGE_LABELS: "approved,!work-in-progress,!hold" - MERGE_METHOD: "rebase" + MERGE_METHOD: "squash" MERGE_DELETE_BRANCH: "true" + UPDATE_LABELS: "approved,!work-in-progress,!hold"