-
Notifications
You must be signed in to change notification settings - Fork 117
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat(mergify): Add mergify config (#234)
Also add venv to .gitignore so we don't accidentally check in our python virtual environments.
- Loading branch information
Showing
2 changed files
with
40 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -15,3 +15,4 @@ var/ | |
.idea | ||
spinnaker-monitoring.iml | ||
generated_dashboards | ||
venv/ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,39 @@ | ||
pull_request_rules: | ||
- name: Automatically merge on CI success and review | ||
conditions: | ||
- base=master | ||
- status-success=build | ||
- "label=ready to merge" | ||
- "approved-reviews-by=@oss-approvers" | ||
actions: | ||
merge: | ||
method: squash | ||
strict: smart | ||
label: | ||
add: ["auto merged"] | ||
- name: Automatically merge release branch changes on CI success and release manager review | ||
conditions: | ||
- base~=^release- | ||
- status-success=build | ||
- "label=ready to merge" | ||
- "approved-reviews-by=@release-managers" | ||
actions: | ||
merge: | ||
method: squash | ||
strict: smart | ||
label: | ||
add: ["auto merged"] | ||
# This rule exists to handle release branches that are still building using Travis CI instead of | ||
# using Github actions. It can be deleted once all active release branches are running Github actions. | ||
- name: Automatically merge release branch changes on Travis CI success and release manager review | ||
conditions: | ||
- base~=^release- | ||
- status-success=continuous-integration/travis-ci/pr | ||
- "label=ready to merge" | ||
- "approved-reviews-by=@release-managers" | ||
actions: | ||
merge: | ||
method: squash | ||
strict: smart | ||
label: | ||
add: ["auto merged"] |