Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .ci/bump-golang.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ actions:
spec:
automerge: true
labels:
- automation
- dependencies
- backport-skip
description: |
Expand Down
15 changes: 15 additions & 0 deletions .mergify.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
queue_rules:
- name: default
conditions:
- check-success=beats-ci/pr-merge
- check-success=CLA
pull_request_rules:
- name: delete upstream branch after merging changes on Jenkinsfile or it's closed
conditions:
Expand Down Expand Up @@ -49,6 +54,16 @@ pull_request_rules:
message: |
This pull request has been automatically closed by Mergify.
There are some other up-to-date pull requests.
- name: squash and merge updatecli PRs after CI passes with golang bump updates
conditions:
- label=automation
- head~=^updatecli
- -conflict
- files~=^go/Makefile.common
actions:
queue:
method: squash
name: default
- name: notify the backport has not been merged yet
conditions:
- -merged
Expand Down