Always run CI so that we can merge all PRs
This commit is contained in:
parent
cd9f33ed41
commit
ff0abb01b3
12
.github/workflows/tests.yml
vendored
12
.github/workflows/tests.yml
vendored
|
@ -1,15 +1,7 @@
|
|||
name: tests
|
||||
on:
|
||||
push:
|
||||
paths-ignore:
|
||||
- "*.yml"
|
||||
- .gitignore
|
||||
- "*.md"
|
||||
pull_request:
|
||||
paths-ignore:
|
||||
- "*.yml"
|
||||
- .gitignore
|
||||
- "*.md"
|
||||
- push
|
||||
- pull_request
|
||||
|
||||
env:
|
||||
DEBIAN_FRONTEND: noninteractive
|
||||
|
|
51
.mergify.yml
51
.mergify.yml
|
@ -2,21 +2,12 @@ pull_request_rules:
|
|||
- name: automatic merge for main when CI passes and approved
|
||||
conditions:
|
||||
- "#approved-reviews-by>=1"
|
||||
- or:
|
||||
- and:
|
||||
# Unfortunately, we cannot just say "all CI must pass".
|
||||
# This is not a bot limitation, but a limitation in Github itself.
|
||||
- and:
|
||||
- check-success=all-tests
|
||||
- check-success=docker
|
||||
- check-success=SonarCloud Code Analysis
|
||||
# Auto-merge in the case where tests were not run
|
||||
# because no source files were modified
|
||||
- and:
|
||||
- -files~=^av1an-cli/
|
||||
- -files~=^av1an-core/
|
||||
- -files~=^src/
|
||||
- -files~=^Cargo.*
|
||||
- -files~=^Dockerfile
|
||||
- check-success=all-tests
|
||||
- check-success=docker
|
||||
- check-success=SonarCloud Code Analysis
|
||||
- base=master
|
||||
actions:
|
||||
queue:
|
||||
|
@ -26,17 +17,12 @@ pull_request_rules:
|
|||
update_method: rebase
|
||||
- name: automatic merge for stable backports when CI passes
|
||||
conditions:
|
||||
- or:
|
||||
- and:
|
||||
- check-success=all-tests
|
||||
- check-success=docker
|
||||
- check-success=SonarCloud Code Analysis
|
||||
- and:
|
||||
- -files~=^av1an-cli/
|
||||
- -files~=^av1an-core/
|
||||
- -files~=^src/
|
||||
- -files~=^Cargo.*
|
||||
- -files~=^Dockerfile
|
||||
- and:
|
||||
# Unfortunately, we cannot just say "all CI must pass".
|
||||
# This is not a bot limitation, but a limitation in Github itself.
|
||||
- check-success=all-tests
|
||||
- check-success=docker
|
||||
- check-success=SonarCloud Code Analysis
|
||||
- base=stable
|
||||
- or:
|
||||
- "#approved-reviews-by>=1"
|
||||
|
@ -69,14 +55,9 @@ pull_request_rules:
|
|||
queue_rules:
|
||||
- name: default
|
||||
conditions:
|
||||
- or:
|
||||
- and:
|
||||
- check-success=all-tests
|
||||
- check-success=docker
|
||||
- check-success=SonarCloud Code Analysis
|
||||
- and:
|
||||
- -files~=^av1an-cli/
|
||||
- -files~=^av1an-core/
|
||||
- -files~=^src/
|
||||
- -files~=^Cargo.*
|
||||
- -files~=^Dockerfile
|
||||
- and:
|
||||
# Unfortunately, we cannot just say "all CI must pass".
|
||||
# This is not a bot limitation, but a limitation in Github itself.
|
||||
- check-success=all-tests
|
||||
- check-success=docker
|
||||
- check-success=SonarCloud Code Analysis
|
||||
|
|
Loading…
Reference in a new issue