Skip to content

Commit

Permalink
ci(mergify): use integration test combined result
Browse files Browse the repository at this point in the history
  • Loading branch information
mhofman committed Aug 29, 2023
1 parent 62c7740 commit 3e0bc6c
Showing 1 changed file with 4 additions and 33 deletions.
37 changes: 4 additions & 33 deletions .mergify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,46 +5,17 @@ queue_rules:
- base=master
# Require integration tests before merging only
- or:
- label=bypass:integration
- check-failure!=Integration tests
- or:
- label=bypass:integration
- check-success=deployment-test
- check-neutral=deployment-test
- check-skipped=deployment-test
- or:
- label=bypass:integration
- check-failure!=test-docker-build (main)
- or:
- label=bypass:integration
- check-skipped=test-docker-build
- check-success=test-docker-build (main)
- check-neutral=test-docker-build (main)
- check-skipped=test-docker-build (main)
- or:
- label=bypass:integration
- check-failure!=getting-started (link-cli)
- or:
- label=bypass:integration
- check-skipped=getting-started
- check-success=getting-started (link-cli)
- check-neutral=getting-started (link-cli)
- check-skipped=getting-started (link-cli)
# FIXME: Enable this section to validate NPM deploys...
#- or:
# - label=bypass:integration
# - check-skipped=getting-started
# - check-success=getting-started (local-npm)
# - check-neutral=getting-started (local-npm)
# - check-skipped=getting-started (local-npm)
- check-success=integration-test-result
- check-neutral=integration-test-result
- check-skipped=integration-test-result

pull_request_rules:
- name: merge to master
conditions:
- base=master
- label=automerge:no-update
- or:
- "#commits-behind=0"
- '#commits-behind=0'
- label=bypass:linear-history
- or:
- check-success=wait-integration-pre-checks
Expand Down

0 comments on commit 3e0bc6c

Please sign in to comment.