Skip to content

Commit df4b0a9

Browse files
authored
ci: align Mergify queue checks with main (#902)
## Summary - switch the Mergify base branch condition from master to main - require both docker-test matrix checks in the dependabot merge queue ## Verification - docker compose -f .devcontainer/docker-compose.yml up -d - docker exec devcontainer-app-1 bash -lc 'cd /workspace && make setup && make ready' ## Notes - this slice changes only .mergify.yml and was rebuilt from main after #901 merged - the Dev Container mount for linked worktrees does not preserve in-container git metadata, so verification was executed from /workspace without relying on git commands inside the container
1 parent 51ce79a commit df4b0a9

1 file changed

Lines changed: 3 additions & 2 deletions

File tree

.mergify.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,11 @@ queue_rules:
44
- author=dependabot[bot]
55
merge_conditions:
66
- author=dependabot[bot]
7-
- status-success=docker-test
7+
- check-success=docker-test (false)
8+
- check-success=docker-test (true)
89
- status-success=hadolint
910
- status-success=ruby
10-
- base=master
11+
- base=main
1112
merge_method: squash
1213

1314
pull_request_rules:

0 commit comments

Comments
 (0)