Skip to content

Commit c6e3385

Browse files
committed
ci: tweaks to ci following github testing
1 parent 5fbd57c commit c6e3385

File tree

2 files changed

+39
-38
lines changed

2 files changed

+39
-38
lines changed

.github/workflows/ci_linting.yml

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -6,23 +6,28 @@ on:
66
branches:
77
- main
88

9+
910
jobs:
1011
build:
11-
runs-on: ubuntu-latest
12-
strategy:
13-
matrix:
14-
python-version: ["3.7.17"]
15-
12+
runs-on: ubuntu-24.04
1613
steps:
1714
- uses: actions/checkout@v5
1815

19-
- name: Set up ${{ matrix.python-version }}
20-
uses: actions/setup-python@v5
21-
with:
22-
python-version: ${{ matrix.python-version }}
16+
- name: Install extra dependencies for a python 3.7.17 install
17+
run: |
18+
sudo apt-get update
19+
sudo apt -y install --no-install-recommends liblzma-dev libbz2-dev libreadline-dev
20+
21+
- name: Install asdf cli
22+
uses: asdf-vm/actions/setup@v4
2323

24-
- name: Install Poetry
25-
run: pipx install poetry==2.2.0
24+
- name: Install Python 3.7.17
25+
run: |
26+
asdf plugin add python
27+
asdf install python 3.7.17
28+
29+
- name: Install Poetry and Java
30+
uses: asdf-vm/actions/install@v4
2631

2732
- name: Cache Poetry virtualenv
2833
uses: actions/cache@v4
@@ -33,14 +38,9 @@ jobs:
3338
${{ runner.os }}-poetry-
3439
3540
- name: Install lint dependencies
36-
run: poetry install --with lint
37-
38-
# Ignoring pip-audit for now - known vulnerabilities with py 3.7
39-
# - name: Install pip-audit
40-
# run: poetry run pip install --force-reinstall pip-audit
41-
42-
# - name: Run Audit
43-
# run: poetry run pip-audit
41+
run: |
42+
poetry run pip install --upgrade pip
43+
poetry install --with lint
4444
4545
- name: Run isort
4646
run: poetry run isort src

.github/workflows/ci_testing.yml

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -9,22 +9,25 @@ on:
99

1010
jobs:
1111
build:
12-
runs-on: ubuntu-latest
13-
strategy:
14-
matrix:
15-
python-version: ["3.7.17"]
16-
12+
runs-on: ubuntu-24.04
1713
steps:
18-
- uses: actions/checkout@v5
19-
20-
- name: Set up ${{ matrix.python-version }}
21-
uses: actions/setup-python@v5
22-
with:
23-
python-version: ${{ matrix.python-version }}
14+
- name: Checkout code
15+
uses: actions/checkout@v5
2416

25-
- name: Install Poetry
17+
- name: Install extra dependencies for a python 3.7.17 install
2618
run: |
27-
pipx install poetry==1.4.2
19+
sudo apt-get update
20+
sudo apt -y install --no-install-recommends liblzma-dev libbz2-dev libreadline-dev
21+
- name: Install asdf cli
22+
uses: asdf-vm/actions/setup@v4
23+
24+
# - name: Install Python 3.7.17
25+
# run: |
26+
# asdf plugin add python
27+
# asdf install python 3.7.17
28+
29+
- name: Install Python, Poetry and Java
30+
uses: asdf-vm/actions/install@v4
2831

2932
- name: Cache Poetry virtualenv
3033
uses: actions/cache@v4
@@ -33,11 +36,9 @@ jobs:
3336
key: ${{ runner.os }}-poetry-${{ hashFiles('**/poetry.lock') }}
3437
restore-keys: |
3538
${{ runner.os }}-poetry-
36-
3739
- name: Install test dependencies
3840
run: |
39-
poetry install --with test
40-
41+
make install-test
4142
- name: Run unit tests
4243
run: make coverage
4344

@@ -46,6 +47,6 @@ jobs:
4647
with:
4748
name: coverage-xml
4849
path: coverage.xml
49-
50-
- name: Run behave tests
51-
run: make behave
50+
51+
# - name: Run behave tests
52+
# run: make behave

0 commit comments

Comments
 (0)