From 38829b1f4b096291a66a67cfe01c91c66b27e945 Mon Sep 17 00:00:00 2001 From: Chris Hennick <4961925+Pr0methean@users.noreply.github.com> Date: Sun, 28 Apr 2024 11:48:46 -0700 Subject: [PATCH] ci: Enable CI run when requested for a merge group --- .github/workflows/auto_merge_prs.yml | 2 +- .github/workflows/ci.yaml | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/auto_merge_prs.yml b/.github/workflows/auto_merge_prs.yml index 034c9c80..8bb98235 100644 --- a/.github/workflows/auto_merge_prs.yml +++ b/.github/workflows/auto_merge_prs.yml @@ -6,7 +6,7 @@ permissions: pull-requests: write jobs: - dependabot: + auto-merge: runs-on: ubuntu-latest if: ${{ github.actor == 'dependabot[bot]' || github.actor == 'github-actions' || github.actor == 'Pr0methean' }} steps: diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 7ec24555..b3ae8ce7 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -9,6 +9,8 @@ on: - 'release-plz-**' - 'dependabot/**' workflow_dispatch: + merge_group: + types: [checks_requested] env: RUSTFLAGS: -Dwarnings