Skip to content

Commit

Permalink
Revert change to controller-runtime, require e2e before automatic mer…
Browse files Browse the repository at this point in the history
…ge (#167)

Signed-off-by: Juraci Paixão Kröhling <juraci@kroehling.de>
  • Loading branch information
jpkrohling authored Jan 22, 2021
1 parent 0ea829a commit d28814c
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
2 changes: 2 additions & 0 deletions .github/mergify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ pull_request_rules:
conditions:
- "#approved-reviews-by>=1"
- "-draft"
- "status-success=End-to-end tests"
- "status-success=Unit tests"
- "status-success=Code standards (linting)"
- "status-success=Security"
Expand All @@ -22,6 +23,7 @@ pull_request_rules:
- name: automatic merge for Dependabot pull requests
conditions:
- author~=^dependabot(|-preview)\[bot\]$
- "status-success=End-to-end tests"
- "status-success=Unit tests"
- "status-success=Code standards (linting)"
- "status-success=Security"
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ require (
k8s.io/apimachinery v0.20.2
k8s.io/client-go v0.20.2
k8s.io/kubectl v0.20.2
sigs.k8s.io/controller-runtime v0.8.0
sigs.k8s.io/controller-runtime v0.7.0
)

replace (
Expand Down

0 comments on commit d28814c

Please sign in to comment.