From 7ec3045ec3cb23509554026caaa2ba29f55dde4c Mon Sep 17 00:00:00 2001 From: Mike Alfare Date: Wed, 9 Oct 2024 17:08:52 -0400 Subject: [PATCH] update release workflows to work with both packages --- .github/workflows/ci.yml | 7 +++++-- .github/workflows/functional-tests.yml | 8 ++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a500b335..6bf00178 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,13 +17,16 @@ jobs: python-version: '3.11' - run: hatch run code-quality working-directory: ./dbt-athena + - run: hatch run code-quality + working-directory: ./dbt-athena-community unit_test: - name: 'Unit tests with coverage' + name: 'Unit tests - ${{ matrix.package }} - ${{ matrix.python-version }}' runs-on: ubuntu-latest strategy: matrix: python-version: ['3.8', '3.9', '3.10', '3.11', '3.12'] + package: ['dbt-athena', 'dbt-athena-community'] steps: - uses: actions/checkout@v3 - name: "Setup `hatch`" @@ -32,4 +35,4 @@ jobs: python-version: ${{ matrix.python-version }} - name: Test with pytest run: hatch run unit-tests - working-directory: ./dbt-athena + working-directory: ./${{ matrix.package }} diff --git a/.github/workflows/functional-tests.yml b/.github/workflows/functional-tests.yml index c1e4dbd7..55b16e74 100644 --- a/.github/workflows/functional-tests.yml +++ b/.github/workflows/functional-tests.yml @@ -21,6 +21,9 @@ jobs: functional-tests-pr: name: Functional Tests - PR uses: ./.github/workflows/functional-tests-workflow.yml + strategy: + matrix: + package: ['dbt-athena', 'dbt-athena-community'] secrets: inherit permissions: id-token: write @@ -30,6 +33,7 @@ jobs: checkout-ref: ${{ github.event.pull_request.head.ref }} # this allows to work on fork checkout-repository: ${{ github.event.pull_request.head.repo.full_name }} + package: ${{ matrix.package }} # workflow that is invoked when a push to main happens functional-tests-main: @@ -39,6 +43,9 @@ jobs: || github.event_name == 'workflow_dispatch' || github.event_name == 'workflow_call' uses: ./.github/workflows/functional-tests-workflow.yml + strategy: + matrix: + package: ['dbt-athena', 'dbt-athena-community'] secrets: inherit permissions: id-token: write @@ -46,3 +53,4 @@ jobs: with: checkout-ref: ${{ github.ref }} checkout-repository: ${{ github.repository }} + package: ${{ matrix.package }}