From bf955c7543dac8911a6f6c334b5b3ca4ef728d9c Mon Sep 17 00:00:00 2001 From: Jimmy Chen Date: Fri, 14 Feb 2025 10:23:38 +1100 Subject: [PATCH] Update mergify conditions for `trivial` and `ready-for-merge` labels to satisfy if base is not `stable` (#6997) --- .github/mergify.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/mergify.yml b/.github/mergify.yml index 1aa24f8302..73267904b8 100644 --- a/.github/mergify.yml +++ b/.github/mergify.yml @@ -15,7 +15,7 @@ pull_request_rules: - name: Approve trivial maintainer PRs conditions: - - base=unstable + - base!=stable - label=trivial - author=@sigp/lighthouse - -conflict @@ -26,7 +26,7 @@ pull_request_rules: - name: Add ready-to-merge labeled PRs to merge queue conditions: # All branch protection rules are implicit: https://docs.mergify.com/conditions/#about-branch-protection - - base=unstable + - base!=stable - label=ready-for-merge - label!=do-not-merge actions: