Skip to content

Commit 267f86e

Browse files
authored
Merge pull request #34 from mc-rtc/mergify/configuration-deprecated-update
ci(mergify): upgrade configuration to current format
2 parents 8c02d39 + d788685 commit 267f86e

1 file changed

Lines changed: 6 additions & 6 deletions

File tree

.mergify.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ pull_request_rules:
44
- name: queue [bot] PRs when CI pass
55
conditions:
66
- or:
7-
- author = dependabot[bot]
8-
- author = gepetto-flake-updater[bot]
9-
- author = mc-rtc-nixpkgs-flake-updater[bot]
10-
- author = github-actions[bot]
11-
- author = pre-commit-ci[bot]
7+
- author = dependabot[bot]
8+
- author = gepetto-flake-updater[bot]
9+
- author = mc-rtc-nixpkgs-flake-updater[bot]
10+
- author = github-actions[bot]
11+
- author = pre-commit-ci[bot]
1212
actions:
1313
queue:
1414

@@ -22,6 +22,6 @@ pull_request_rules:
2222
# ensure that required CI jobs suceed
2323
queue_rules:
2424
- name: default
25-
conditions:
25+
merge_conditions:
2626
- check-success = "check-macos-linux-nix"
2727
- check-success = "check-macos-linux-nix-private"

0 commit comments

Comments
 (0)