From c681c2696d5930f6219a7ed3b0f014315d1ad871 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edwin=20T=C3=B6r=C3=B6k?= Date: Mon, 16 Sep 2024 11:28:32 +0100 Subject: [PATCH] [ci]: enable merge queues MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Required for merge queues, so we have some tests that run in the merge queue: 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 Signed-off-by: Edwin Török --- .github/workflows/format.yml | 1 + .github/workflows/main.yml | 1 + .github/workflows/other.yml | 1 + .github/workflows/shellcheck.yaml | 1 + 4 files changed, 4 insertions(+) diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml index 4d0350056f3..3c2d7148f90 100644 --- a/.github/workflows/format.yml +++ b/.github/workflows/format.yml @@ -6,6 +6,7 @@ on: - master - 'feature/**' - '*-lcm' + merge_group: jobs: ocaml-format: diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 79ce257d7f2..f3f7e00a69f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -6,6 +6,7 @@ on: schedule: # run daily, this refreshes the cache - cron: "13 2 * * *" + merge_group: concurrency: # On new push, cancel old workflows from the same PR, branch or tag: group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} diff --git a/.github/workflows/other.yml b/.github/workflows/other.yml index c4042638922..52c73729594 100644 --- a/.github/workflows/other.yml +++ b/.github/workflows/other.yml @@ -6,6 +6,7 @@ on: schedule: # run daily, this refreshes the cache - cron: "13 2 * * *" + merge_group: concurrency: # On new push, cancel old workflows from the same PR, branch or tag: group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} diff --git a/.github/workflows/shellcheck.yaml b/.github/workflows/shellcheck.yaml index c17568d821c..8be332ada23 100644 --- a/.github/workflows/shellcheck.yaml +++ b/.github/workflows/shellcheck.yaml @@ -2,6 +2,7 @@ name: ShellCheck on: pull_request: + merge_group: concurrency: # On new push, cancel old workflows from the same PR, branch or tag: group: sc-${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}