From 6ac1844e92cd193f84cefd041658323d93230339 Mon Sep 17 00:00:00 2001 From: Liam Heeger Date: Tue, 14 May 2024 22:54:21 +0000 Subject: [PATCH 1/5] ci: fix concurrency groups, and test it --- .github/workflows/test_firedancer.yml | 3 +++ .github/workflows/test_firedancer_testnet.yml | 3 +++ .github/workflows/tests.yml | 3 +++ 3 files changed, 9 insertions(+) diff --git a/.github/workflows/test_firedancer.yml b/.github/workflows/test_firedancer.yml index a1e8d1def3..4022ade439 100644 --- 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 index 34a0441da3..58aa54434b 100644 --- a/.github/workflows/test_firedancer_testnet.yml +++ b/.github/workflows/test_firedancer_testnet.yml @@ -4,6 +4,9 @@ on: 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 diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 6fae146917..3e5a679c71 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -4,6 +4,9 @@ name: Tests on: workflow_call: workflow_dispatch: +concurrency: + group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} + cancel-in-progress: true jobs: test: strategy: From 44776da71bce432545828924452f27d08e370885 Mon Sep 17 00:00:00 2001 From: Liam Heeger Date: Thu, 16 May 2024 20:43:02 +0000 Subject: [PATCH 2/5] ci: add tests to merge group --- .github/workflows/tests.yml | 1 + 1 file changed, 1 insertion(+) 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 From 4362cf18aad0f32d903912d6a46af189f8d483fd Mon Sep 17 00:00:00 2001 From: Liam Heeger Date: Thu, 16 May 2024 21:09:33 +0000 Subject: [PATCH 3/5] ci: fix merge queue --- .github/workflows/on_pull_request.yml | 1 - .github/workflows/tests.yml | 1 - 2 files changed, 2 deletions(-) diff --git a/.github/workflows/on_pull_request.yml b/.github/workflows/on_pull_request.yml index 00fbf50eca..d244e1a894 100644 --- 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/tests.yml b/.github/workflows/tests.yml index acfb5afa0a..3e5a679c71 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -4,7 +4,6 @@ name: Tests on: workflow_call: workflow_dispatch: - merge_group: concurrency: group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} cancel-in-progress: true From 4769a6e45e4067cd91f35b30489b3ef2248b2c22 Mon Sep 17 00:00:00 2001 From: Liam Heeger Date: Thu, 16 May 2024 21:55:39 +0000 Subject: [PATCH 4/5] 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 From eae933883059c20f763f6d2a14750cba974d3f8f Mon Sep 17 00:00:00 2001 From: Liam Heeger Date: Thu, 16 May 2024 22:00:12 +0000 Subject: [PATCH 5/5] ci: move testnet test to nightly --- .github/workflows/on_nightly.yml | 4 ++++ .github/workflows/test_firedancer_testnet.yml | 3 --- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/on_nightly.yml b/.github/workflows/on_nightly.yml index 0b579add5f..bcb071ac2f 100644 --- a/.github/workflows/on_nightly.yml +++ b/.github/workflows/on_nightly.yml @@ -17,3 +17,7 @@ jobs: coverage-report: uses: ./.github/workflows/coverage_report.yml secrets: inherit + test-firedancer-testnet: + uses: ./.github/workflows/test_firedancer_testnet.yml + secrets: inherit + \ No newline at end of file diff --git a/.github/workflows/test_firedancer_testnet.yml b/.github/workflows/test_firedancer_testnet.yml index 58aa54434b..d0d79bafe3 100644 --- a/.github/workflows/test_firedancer_testnet.yml +++ b/.github/workflows/test_firedancer_testnet.yml @@ -2,15 +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