From 3e3df0726903078a87030ff7547a8117fd990170 Mon Sep 17 00:00:00 2001 From: diegomrsantos Date: Tue, 10 Sep 2024 18:10:24 +0200 Subject: [PATCH] chore: add support to merge queues (#1192) This change is necessary before enabling merge queues. The `merge_group` event is needed to trigger the GitHub Actions workflow when a pull request is added to a merge queue. The merge queue provides the same benefits as the Require branches to be up to date before merging branch protection but does not require a pull request author to update their pull request branch and wait for status checks to finish before trying to merge. More info on https://docs.github.com/en/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/managing-a-merge-queue. --- .github/workflows/ci.yml | 1 + .github/workflows/coverage.yml | 1 + .github/workflows/interop.yml | 1 + .github/workflows/linters.yml | 1 + 4 files changed, 4 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fcc8ed1cf..3187c5502 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -5,6 +5,7 @@ on: branches: - master pull_request: + merge_group: workflow_dispatch: concurrency: diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index 062ed8fbc..4c40584a9 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -6,6 +6,7 @@ on: branches: - master pull_request: + merge_group: workflow_dispatch: concurrency: diff --git a/.github/workflows/interop.yml b/.github/workflows/interop.yml index 57c5eb05f..8290a6c39 100644 --- a/.github/workflows/interop.yml +++ b/.github/workflows/interop.yml @@ -2,6 +2,7 @@ name: Interoperability Tests on: pull_request: + merge_group: push: branches: - master diff --git a/.github/workflows/linters.yml b/.github/workflows/linters.yml index 1108201da..6ae8eb20c 100644 --- a/.github/workflows/linters.yml +++ b/.github/workflows/linters.yml @@ -2,6 +2,7 @@ name: Linters on: pull_request: + merge_group: concurrency: group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}