diff --git a/.github/mergify.yml b/.github/mergify.yml index 3a837fbf..9fe8e2e6 100644 --- a/.github/mergify.yml +++ b/.github/mergify.yml @@ -38,7 +38,8 @@ pull_request_rules: - name: Keep imgbot image optimizations current on develop conditions: - - author=imgbot[bot] + # ImgBot has used both identities here, so keep both to avoid breaking auto-merge. + - author~=^(imgbot\[bot\]|app/imgbot)$ - base=develop - -draft - -conflict @@ -48,7 +49,8 @@ pull_request_rules: - name: Auto-merge imgbot image optimizations on develop conditions: - - author=imgbot[bot] + # ImgBot has used both identities here, so keep both to avoid breaking auto-merge. + - author~=^(imgbot\[bot\]|app/imgbot)$ - base=develop - check-success=All Checks Passed - -draft