Skip to content

Commit

Permalink
more fixed
Browse files Browse the repository at this point in the history
  • Loading branch information
daimor committed Jul 6, 2024
1 parent a6eb2d2 commit a2a7ede
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 17 deletions.
30 changes: 18 additions & 12 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -76,30 +76,36 @@ jobs:
run: pre-commit run --all-files --show-diff-on-failure

test-build:
strategy:
fail-fast: false
matrix:
image:
- containers.intersystems.com/intersystems/iris-community:latest-em
- containers.intersystems.com/intersystems/iris-community:latest-preview
python:
- name: py38
version: "3.8"
- name: py39
version: "3.9"
- name: py310
version: "3.10"
- name: py311
version: "3.11"
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4
- name: Set up Python
uses: actions/setup-python@v5
with:
python-version: |
3.8
3.9
3.10
3.11
python-version: ${{ matrix.python.version }}
- name: install dependencies
run: |
pip install tox
- name: Build Docker image
run: docker build -t dbt-iris:$GITHUB_SHA .
- name: Run Container
run: |
docker run --rm -d -p 1972:1972 dbt-iris:$GITHUB_SHA \
-a 'iris session iris -U %SYS "##class(Security.Users).UnExpireUserPasswords(\"*\")"'
- run: docker pull ${{ matrix.image }}
- name: Run Tests
run: |
tox -e py38-iris,py39-iris,py310-iris,py311-iris -- --container containers.intersystems.com/intersystems/iris-community:latest
tox -e ${{ matrix.python.name }}-iris -- --container ${{ matrix.image }}
build:
needs:
Expand Down
6 changes: 3 additions & 3 deletions tests/functional/projects/__init__.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
from tests.functional.projects.dbt_integration import dbt_integration
from tests.functional.projects.graph_selection import GraphSelection
from tests.functional.projects.jaffle_shop import JaffleShop
from tests.functional.projects.dbt_integration import dbt_integration # noqa
from tests.functional.projects.graph_selection import GraphSelection # noqa
from tests.functional.projects.jaffle_shop import JaffleShop # noqa
4 changes: 2 additions & 2 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tox]
skipsdist = True
envlist = py3{7,8,9,10}{-iris,}
envlist = py3{8,9,10,11}{-iris,}

[testenv:{py37,py38,py39,py310}]
description = unit testing
Expand All @@ -12,7 +12,7 @@ deps =
-r requirements-dev.txt
-e.

[testenv:py3{7,8,9,10}-iris]
[testenv:py3{8,9,10,11}-iris]
description = adapter plugin functional testing
skip_install = true
passenv = DBT_*,IRIS_TEST_*,PYTEST_ADOPTS
Expand Down

0 comments on commit a2a7ede

Please sign in to comment.