From f522a83f419c450d4f3257c70586e7114e9cf442 Mon Sep 17 00:00:00 2001 From: Blaine Bublitz Date: Tue, 9 Jan 2024 13:26:27 -0700 Subject: [PATCH] ci: Add merge queue workflow --- .github/workflows/examples.yml | 2 +- .github/workflows/merge_queue.yml | 15 +++++++++++++++ .github/workflows/test.yml | 2 +- 3 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 .github/workflows/merge_queue.yml diff --git a/.github/workflows/examples.yml b/.github/workflows/examples.yml index 539bd2369..249e460d1 100644 --- a/.github/workflows/examples.yml +++ b/.github/workflows/examples.yml @@ -1,6 +1,6 @@ name: "Build examples" -on: [push, pull_request] +on: [push, pull_request, workflow_call] concurrency: group: ${{ github.workflow }}-${{ github.ref }} diff --git a/.github/workflows/merge_queue.yml b/.github/workflows/merge_queue.yml new file mode 100644 index 000000000..167426585 --- /dev/null +++ b/.github/workflows/merge_queue.yml @@ -0,0 +1,15 @@ +name: Merge queue + +on: + push: + branches: + - trunk-merge/** + +jobs: + test: + name: Merge queue - Run tests + uses: ./.github/workflows/test.yml + + examples: + name: Merge queue - Build examples + uses: ./.github/workflows/examples.yml diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 903ecfbfc..2390181fe 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -1,6 +1,6 @@ name: "Run tests" -on: [push, pull_request] +on: [push, pull_request, workflow_call] concurrency: group: ${{ github.workflow }}-${{ github.ref }}