diff --git a/.circleci/config.yml b/.circleci/config.yml index 7638275f..76b3838d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -6,7 +6,6 @@ orbs: workflows: version: 2 workflow: - # Keep those job names in sync with .mergify.yml jobs: - build - docs-build: diff --git a/.mergify.yml b/.mergify.yml deleted file mode 100644 index d6206bf0..00000000 --- a/.mergify.yml +++ /dev/null @@ -1,20 +0,0 @@ -# See https://doc.mergify.io/configuration.html - -pull_request_rules: - - name: automerge to main with label automerge - conditions: - - "#approved-reviews-by>=1" - - base=main - - label=automerge - - label!=WIP - # We need to list them all individually. Here is why: https://doc.mergify.io/conditions.html#validating-all-status-check - - "status-success=ci/circleci: build" - - "status-success=ci/circleci: coverage" - - "status-success=ci/circleci: docs-build" - - "status-success=ci/circleci: lint" - - "status-success=ci/circleci: test" - - "status-success=ci/circleci: test-chrome" - actions: - merge: - method: merge - strict: false