Skip to content

Commit

Permalink
mergify: replace queue action for queue_rules (#3891)
Browse files Browse the repository at this point in the history
Force merging as it tests won't pass without a 9.x release
  • Loading branch information
v1v authored Sep 12, 2024
1 parent dfeebfc commit b6af3cd
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions .mergify.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
queue_rules:
- name: default
merge_method: squash
conditions:
- check-success=fleet-server/pr-merge

Expand Down Expand Up @@ -84,7 +85,6 @@ pull_request_rules:
type: APPROVE
message: Automatically approving mergify
queue:
method: squash
name: default
- name: automatic merge when CI passes and the file dev-tools/integration/.env is modified.
conditions:
Expand All @@ -96,7 +96,6 @@ pull_request_rules:
type: APPROVE
message: Automatically approving mergify
queue:
method: squash
name: default
- name: delete upstream branch with changes on dev-tools/integration/.env or .go-version after merging/closing it
conditions:
Expand Down

0 comments on commit b6af3cd

Please sign in to comment.