From c4358ab3360c7e0036098a9ab60d05237bf5dac2 Mon Sep 17 00:00:00 2001 From: Jack Wrenn Date: Mon, 2 Oct 2023 11:36:06 -0400 Subject: [PATCH] Configure CI for merge_queue. Fixes #742. See https://docs.github.com/en/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/managing-a-merge-queue#triggering-merge-group-checks-with-github-actions --- .github/workflows/ci.yml | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d90274ea4..83deb9e40 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -2,10 +2,7 @@ name: CI on: pull_request: - push: - branches: - - staging - - trying + merge_group: jobs: check: @@ -52,12 +49,12 @@ jobs: components: rustfmt - run: cargo fmt --check - # https://github.com/rust-lang/crater/blob/9ab6f9697c901c4a44025cf0a39b73ad5b37d198/.github/workflows/bors.yml#L125-L149 - end-success: - name: bors build finished + # Used to signal to branch protections that all other jobs have succeeded. + all-jobs-succeed: + name: All checks succeeded if: success() runs-on: ubuntu-latest - needs: [check, test] + needs: [check, msrv, test, check-format] steps: - name: Mark the job as successful run: exit 0