From 0bff008922e2583b2a1289b46647f38ff5f1828e Mon Sep 17 00:00:00 2001 From: Christian Kellner Date: Mon, 6 Dec 2021 19:25:26 +0000 Subject: [PATCH] [skip ci] ci: don't require branch protection For dependabot we dont want it anyway (but it is true by default). Also remove it for "merge via auto-label", so that once all the conditions are met the PR is queued and the label is removed. Currently the queuing might not happen because the branch protection is not met. Therefore we make the condition explicit and remove the branch protection. --- .github/mergify.yml | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/.github/mergify.yml b/.github/mergify.yml index 3afe1a80..2646fd5f 100644 --- a/.github/mergify.yml +++ b/.github/mergify.yml @@ -10,6 +10,7 @@ queue_rules: - check-success=Test Suite (test.run.test_assemblers) - check-success=Test Suite (test.run.test_boot) - check-success=Test Suite (test.run.test_noop) + - check-success=Test Suite (test.run.test_ostree) - check-success=Test Suite (test.run.test_sources) - check-success=Test Suite (test.run.test_stages) - check-success=Test Suite (test.src) @@ -31,6 +32,7 @@ pull_request_rules: - check-success=Test Suite (test.run.test_assemblers) - check-success=Test Suite (test.run.test_boot) - check-success=Test Suite (test.run.test_noop) + - check-success=Test Suite (test.run.test_ostree) - check-success=Test Suite (test.run.test_sources) - check-success=Test Suite (test.run.test_stages) - check-success=Test Suite (test.src) @@ -45,18 +47,35 @@ pull_request_rules: method: rebase update_method: rebase rebase_fallback: none + require_branch_protection: false - name: Automatic merge on green via label conditions: - base=main - "check-success~=rpm-build:.*" - "label=ci:automerge" + - base=main + - check-success=📚 Documentation + - check-success=Schutzbot on GitLab + - check-success=Test Suite (test.mod) + - check-success=Test Suite (test.run.test_assemblers) + - check-success=Test Suite (test.run.test_boot) + - check-success=Test Suite (test.run.test_noop) + - check-success=Test Suite (test.run.test_ostree) + - check-success=Test Suite (test.run.test_sources) + - check-success=Test Suite (test.run.test_stages) + - check-success=Test Suite (test.src) + - check-success=Regenerate Test Data + - check-success=Spell check + - "check-success=LGTM analysis: Python" + - check-success=codecov/project + - "check-success~=rpm-build:.*" actions: queue: name: default method: rebase update_method: rebase rebase_fallback: none - require_branch_protection: true + require_branch_protection: false label: remove: - ci:automerge