From f71d9a490fe2deaec838d3c1e9590d9e62bee9f2 Mon Sep 17 00:00:00 2001 From: Jaco Date: Wed, 2 Mar 2022 06:24:37 +0100 Subject: [PATCH] Replace mergify with action (#7088) --- .github/mergify.yml | 29 ----------------------------- .github/workflows/merge.yml | 17 +++++++++++++++++ 2 files changed, 17 insertions(+), 29 deletions(-) delete mode 100644 .github/mergify.yml create mode 100644 .github/workflows/merge.yml diff --git a/.github/mergify.yml b/.github/mergify.yml deleted file mode 100644 index 92f3e8503b..0000000000 --- a/.github/mergify.yml +++ /dev/null @@ -1,29 +0,0 @@ -queue_rules: - - name: default - conditions: - - check-success=build:code - - check-success=build:electron - - check-success=build:i18n - - check-success=lint - - check-success=test - - label=automerge - - base=master - - "#changes-requested-reviews-by=0" - - "#approved-reviews-by>=1" - -pull_request_rules: - - name: auto merge - conditions: - - check-success=build:code - - check-success=build:electron - - check-success=build:i18n - - check-success=lint - - check-success=test - - label=automerge - - base=master - - "#changes-requested-reviews-by=0" - - "#approved-reviews-by>=1" - actions: - queue: - name: default - method: squash diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml new file mode 100644 index 0000000000..4d57cfd3b4 --- /dev/null +++ b/.github/workflows/merge.yml @@ -0,0 +1,17 @@ +name: PR + +on: + pull_request: + types: [labeled] + +jobs: + auto-merge: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - uses: jacogr/action-merge@master + with: + checks: build:code,build:i18n,build:electron,lint,test + labels: automerge + strategy: squash + token: ${{ secrets.GH_PAT_BOT }}