From c1af7f4629b6dcb3e6ac5b4dec211496500ce701 Mon Sep 17 00:00:00 2001 From: Philipp Schuster Date: Thu, 21 Sep 2023 12:45:01 +0200 Subject: [PATCH] ci: enable GitHub merge train --- .github/workflows/integrationtest.yml | 4 ++-- .github/workflows/qa.yml | 2 +- .github/workflows/rust.yml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/integrationtest.yml b/.github/workflows/integrationtest.yml index 38ecd06f..6a73d7bc 100644 --- a/.github/workflows/integrationtest.yml +++ b/.github/workflows/integrationtest.yml @@ -6,10 +6,10 @@ # Instead, it is the right thing that the CI always covers the whole repository # and that it is as stable as possible. -name: "Cargo workspace" +name: "Integration Test" # Run on every push (tag, branch) and pull_request -on: [pull_request, push, workflow_dispatch] +on: [pull_request, push, merge_group] env: CARGO_TERM_COLOR: always diff --git a/.github/workflows/qa.yml b/.github/workflows/qa.yml index 8a230bda..c1d83f36 100644 --- a/.github/workflows/qa.yml +++ b/.github/workflows/qa.yml @@ -1,6 +1,6 @@ name: QA -on: [ push, pull_request ] +on: [pull_request, push, merge_group] jobs: spellcheck: diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 9b0b862c..141c4ae8 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -9,7 +9,7 @@ name: "Cargo workspace" # Run on every push (tag, branch) and pull_request -on: [pull_request, push, workflow_dispatch] +on: [pull_request, push, workflow_dispatch, merge_group] env: CARGO_TERM_COLOR: always