ci: fix concurrency groups (#1870)

* ci: fix concurrency groups, and test it * ci: add tests to merge group * ci: fix merge queue * ci: move around workflows * ci: move testnet test to nightly --------- Co-authored-by: Liam Heeger <[email protected]>
firedancer-io · May 16, 2024 · 810f07a · 810f07a
1 parent 340401d
commit 810f07a
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 8 deletions.
diff --git 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
@@ -14,3 +14,10 @@ jobs:
       coverage: true
       machine: linux_clang_zen2
       extras: llvm-cov
+  coverage-report:
+    uses: ./.github/workflows/coverage_report.yml
+    secrets: inherit
+  test-firedancer-testnet:
+    uses: ./.github/workflows/test_firedancer_testnet.yml
+    secrets: inherit
+
diff --git a/.github/workflows/on_pull_request.yml b/.github/workflows/on_pull_request.yml
@@ -1,6 +1,5 @@
 name: On Pull Request
 on:
-  merge_group:
   pull_request:
     types: [synchronize, opened, reopened, ready_for_review]
 concurrency:

diff --git a/.github/workflows/test_firedancer.yml b/.github/workflows/test_firedancer.yml
@@ -5,6 +5,9 @@ on:
   pull_request:
     types: [synchronize, opened, reopened, ready_for_review]
   merge_group:
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
 jobs:
   firedancer-tests:
     runs-on: private

diff --git a/.github/workflows/test_firedancer_testnet.yml b/.github/workflows/test_firedancer_testnet.yml
@@ -2,12 +2,12 @@ name: Firedancer Testnet
 on:
   workflow_call:
   workflow_dispatch:
-  pull_request:
-    types: [synchronize, opened, reopened, ready_for_review]
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
 jobs:
   firedancer-testnet:
     runs-on: private
-    if: github.event.pull_request.draft == false
     env:
       CC: gcc
       EXTRAS: no-solana

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -4,6 +4,10 @@ name: Tests
 on:
   workflow_call:
   workflow_dispatch:
+  merge_group:
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
 jobs:
   test:
     strategy: