From 7090658d7532c35e185c11f7f75fe1122729a266 Mon Sep 17 00:00:00 2001 From: Michael Peyton Jones Date: Wed, 21 Dec 2022 14:51:07 +0000 Subject: [PATCH] Add a mergify action to update PRs After a bit of digging I've worked out what's up with mergify. It's still working fine, but it's not updating PRs very often now. The reason for that is that it updates PRs that are in the queue, but to get _into_ the queue you have to pass CI, which is hard ATM because of our flaky CI. So we can add a separate update rule that just updates the labelled PRs, so that they are at least kept up-to-date with master. --- .github/mergify.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.github/mergify.yml b/.github/mergify.yml index f4dcb23635..15e2dd2653 100644 --- a/.github/mergify.yml +++ b/.github/mergify.yml @@ -13,3 +13,15 @@ pull_request_rules: queue: method: squash name: default + # The queue action automatically updates PRs that + # have entered the queue, but in order to do that + # they must have passed CI. Since our CI is a bit + # flaky, PRs can fail to get in, which then means + # they don't get updated, which is extra annoying. + # This just adds the updating as an independent + # step. + - name: Automatically update pull requests + conditions: + - label=merge me + actions: + update: