diff --git a/.github/dependabot.yml b/.github/dependabot.yml deleted file mode 100644 index ada1147ce..000000000 --- a/.github/dependabot.yml +++ /dev/null @@ -1,21 +0,0 @@ -# version: 2 -# updates: -# - package-ecosystem: github-actions -# directory: "/" -# schedule: -# interval: daily -# - package-ecosystem: pip -# directory: "/.github/workflows" -# schedule: -# interval: daily -# - package-ecosystem: pip -# directory: "/docs" -# schedule: -# interval: daily -# - package-ecosystem: pip -# directory: "/" -# schedule: -# interval: daily -# versioning-strategy: lockfile-only -# allow: -# - dependency-type: "all" diff --git a/.github/labels.yml b/.github/labels.yml index f7f83aad8..c547348b5 100644 --- a/.github/labels.yml +++ b/.github/labels.yml @@ -64,3 +64,6 @@ - name: wontfix description: This will not be worked on color: ffffff +- name: work-in-progress + description: Work in progress that should not be auto-merged + color: ffffff diff --git a/.github/mergify.yml b/.github/mergify.yml new file mode 100644 index 000000000..d3b474717 --- /dev/null +++ b/.github/mergify.yml @@ -0,0 +1,28 @@ +pull_request_rules: + - name: self-assign PRs + conditions: + - -merged + - -closed + - "#assignee=0" + actions: + assign: + add_users: + - "{{ author }}" + - name: automatic merge when not WIP, CI passes, and at least 1 approving review + conditions: + - "#approved-reviews-by>=1" + - check-success=tests 3.10 / ubuntu-latest + - check-success=pre-commit 3.10 / ubuntu-latest + - check-success=docs-build 3.10 / ubuntu-latest + - base=master + - label!=work-in-progress + actions: + queue: + method: squash + name: default +queue_rules: + - name: default + conditions: + - check-success=tests 3.10 / ubuntu-latest + - check-success=pre-commit 3.10 / ubuntu-latest + - check-success=docs-build 3.10 / ubuntu-latest diff --git a/renovate.json b/.github/renovate.json similarity index 88% rename from renovate.json rename to .github/renovate.json index 760b76856..e7d1ab9fc 100644 --- a/renovate.json +++ b/.github/renovate.json @@ -6,5 +6,6 @@ ":semanticCommits", ":semanticCommitTypeAll(chore)", ":semanticCommitScope(deps)" - ] + ], + "labels": ["dependencies"] }