From 435afa3a29263311b78258c6c2e4b5ea079fccd7 Mon Sep 17 00:00:00 2001 From: Liam Heeger Date: Thu, 16 May 2024 21:55:39 +0000 Subject: [PATCH] ci: move around workflows --- .github/workflows/on_main_push.yml | 4 ---- .github/workflows/on_nightly.yml | 3 +++ .github/workflows/tests.yml | 1 + 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/on_main_push.yml b/.github/workflows/on_main_push.yml index b337a9613b..60ec12379c 100644 --- a/.github/workflows/on_main_push.yml +++ b/.github/workflows/on_main_push.yml @@ -14,7 +14,3 @@ jobs: clusterfuzz: uses: ./.github/workflows/clusterfuzz.yml secrets: inherit - - coverage-report: - uses: ./.github/workflows/coverage_report.yml - secrets: inherit diff --git a/.github/workflows/on_nightly.yml b/.github/workflows/on_nightly.yml index fde84c11eb..0b579add5f 100644 --- a/.github/workflows/on_nightly.yml +++ b/.github/workflows/on_nightly.yml @@ -14,3 +14,6 @@ jobs: coverage: true machine: linux_clang_zen2 extras: llvm-cov + coverage-report: + uses: ./.github/workflows/coverage_report.yml + secrets: inherit diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 3e5a679c71..acfb5afa0a 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -4,6 +4,7 @@ name: Tests on: workflow_call: workflow_dispatch: + merge_group: concurrency: group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} cancel-in-progress: true