Skip to content

Commit 47cd122

Browse files
committed
more fixed
1 parent a6eb2d2 commit 47cd122

File tree

3 files changed

+24
-18
lines changed

3 files changed

+24
-18
lines changed

.github/workflows/main.yml

Lines changed: 19 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -76,30 +76,36 @@ jobs:
7676
run: pre-commit run --all-files --show-diff-on-failure
7777

7878
test-build:
79+
strategy:
80+
fail-fast: false
81+
matrix:
82+
image:
83+
- containers.intersystems.com/intersystems/iris-community:latest-em
84+
- containers.intersystems.com/intersystems/iris-community:latest-preview
85+
python:
86+
- name: py38
87+
version: "3.8"
88+
- name: py39
89+
version: "3.9"
90+
- name: py310
91+
version: "3.10"
92+
- name: py311
93+
version: "3.11"
7994
runs-on: ubuntu-latest
8095

8196
steps:
8297
- uses: actions/checkout@v4
8398
- name: Set up Python
8499
uses: actions/setup-python@v5
85100
with:
86-
python-version: |
87-
3.8
88-
3.9
89-
3.10
90-
3.11
101+
python-version: ${{ matrix.python.version }}
91102
- name: install dependencies
92103
run: |
93104
pip install tox
94-
- name: Build Docker image
95-
run: docker build -t dbt-iris:$GITHUB_SHA .
96-
- name: Run Container
97-
run: |
98-
docker run --rm -d -p 1972:1972 dbt-iris:$GITHUB_SHA \
99-
-a 'iris session iris -U %SYS "##class(Security.Users).UnExpireUserPasswords(\"*\")"'
105+
- run: docker pull ${{ matrix.image }}
100106
- name: Run Tests
101107
run: |
102-
tox -e py38-iris,py39-iris,py310-iris,py311-iris -- --container containers.intersystems.com/intersystems/iris-community:latest
108+
tox -e ${{ matrix.python.name }}-iris -- --container ${{ matrix.image }}
103109
104110
build:
105111
needs:
@@ -167,7 +173,7 @@ jobs:
167173
token: ${{ secrets.GITHUB_TOKEN }}
168174
- name: Publish package
169175
if: github.event_name != 'pull_request'
170-
uses: pypa/gh-action-pypi-publish@release/v1.5
176+
uses: pypa/gh-action-pypi-publish@release/v1
171177
- uses: actions/checkout@v4
172178
if: github.event_name == 'release'
173179
with:
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
from tests.functional.projects.dbt_integration import dbt_integration
2-
from tests.functional.projects.graph_selection import GraphSelection
3-
from tests.functional.projects.jaffle_shop import JaffleShop
1+
from tests.functional.projects.dbt_integration import dbt_integration # noqa
2+
from tests.functional.projects.graph_selection import GraphSelection # noqa
3+
from tests.functional.projects.jaffle_shop import JaffleShop # noqa

tox.ini

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[tox]
22
skipsdist = True
3-
envlist = py3{7,8,9,10}{-iris,}
3+
envlist = py3{8,9,10,11}{-iris,}
44

55
[testenv:{py37,py38,py39,py310}]
66
description = unit testing
@@ -12,7 +12,7 @@ deps =
1212
-r requirements-dev.txt
1313
-e.
1414

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

0 commit comments

Comments
 (0)