Skip to content

Commit

Permalink
feat(mergify): Add mergify config (#234)
Browse files Browse the repository at this point in the history
Also add venv to .gitignore so we don't accidentally check in our
python virtual environments.
  • Loading branch information
ezimanyi committed Apr 7, 2020
1 parent a724ee7 commit ac726d7
Show file tree
Hide file tree
Showing 2 changed files with 40 additions and 0 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,4 @@ var/
.idea
spinnaker-monitoring.iml
generated_dashboards
venv/
39 changes: 39 additions & 0 deletions .mergify.yml
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"]

0 comments on commit ac726d7

Please sign in to comment.