From e9dd6b41cb5884fb787fb099f041bc8fd7d06d89 Mon Sep 17 00:00:00 2001 From: Mike Alfare Date: Thu, 10 Oct 2024 18:33:48 -0400 Subject: [PATCH] account for non-parallel-izable integration test runs --- .github/workflows/merge-checks.yml | 15 ++++++++++----- .github/workflows/pull-request-checks.yml | 6 ++---- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/.github/workflows/merge-checks.yml b/.github/workflows/merge-checks.yml index ed7d09b6..d96790ab 100644 --- a/.github/workflows/merge-checks.yml +++ b/.github/workflows/merge-checks.yml @@ -10,12 +10,17 @@ concurrency: cancel-in-progress: true jobs: - integration-tests: + integration-tests-dbt-athena: uses: ./.github/workflows/integration-tests.yml with: - package: ${{ matrix.package }} branch: ${{ github.ref }} secrets: inherit - strategy: - matrix: - package: ["dbt-athena", "dbt-athena-community"] + + # integration test runs can't run in parallel for now, so run them in serial + integration-tests-dbt-athena-community: + needs: integration-tests-dbt-athena + uses: ./.github/workflows/integration-tests.yml + with: + package: "dbt-athena-community" + branch: ${{ github.ref }} + secrets: inherit diff --git a/.github/workflows/pull-request-checks.yml b/.github/workflows/pull-request-checks.yml index 6b79aa29..a06d12fb 100644 --- a/.github/workflows/pull-request-checks.yml +++ b/.github/workflows/pull-request-checks.yml @@ -30,13 +30,11 @@ jobs: if: contains(github.event.pull_request.labels.*.name, 'ci:integration-tests') uses: ./.github/workflows/integration-tests.yml with: - package: ${{ matrix.package }} + # integration test runs can't run in parallel for now, so only run dbt-athena + # both will run post merge and unit tests run for both, so this is sufficient branch: ${{ github.event.pull_request.head.ref }} repository: ${{ github.event.pull_request.head.repo.full_name }} secrets: inherit - strategy: - matrix: - package: ["dbt-athena", "dbt-athena-community"] # This job does nothing and is only used for branch protection results: