Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 398e8a4

Browse files
committedJan 14, 2025·
Switch to ubuntu-22.04 for CI tests
An issue with oscrypto means it currently does not work on 24.04. Ref: wbond/oscrypto#78 (comment)
1 parent ab2eb3c commit 398e8a4

File tree

2 files changed

+17
-48
lines changed

2 files changed

+17
-48
lines changed
 

‎.github/workflows/tests-core.yaml

+9-24
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ on:
1111

1212
jobs:
1313
tests:
14-
runs-on: ubuntu-latest
14+
runs-on: ubuntu-22.04
1515
strategy:
1616
matrix:
1717
python-version: ["3.10", "3.11", "3.12"]
@@ -21,33 +21,18 @@ jobs:
2121

2222
steps:
2323
- uses: actions/checkout@v2
24+
25+
- name: Install Poetry
26+
run: pipx install poetry
27+
2428
- name: Set up Python ${{ matrix.python-version }}
2529
uses: actions/setup-python@v2
2630
with:
2731
python-version: ${{ matrix.python-version }}
28-
- name: Install Poetry
29-
uses: snok/install-poetry@v1
30-
with:
31-
virtualenvs-create: true
32-
virtualenvs-in-project: true
33-
virtualenvs-path: .venv
34-
35-
- name: Load cached venv
36-
id: cached-poetry-dependencies
37-
uses: actions/cache@v4
38-
with:
39-
path: .venv
40-
key: venv-${{ runner.os }}-${{ steps.setup-python.outputs.python-version }}-${{ hashFiles('**/poetry.lock') }}-dev
32+
cache: 'poetry'
4133

4234
- name: Install dependencies
43-
if: steps.cached-poetry-dependencies.outputs.cache-hit != 'true'
44-
run: poetry install --no-interaction --no-root --with dev
45-
46-
- name: Install project
47-
run: poetry install --no-interaction
35+
run: poetry install --no-interaction --with dev
4836

49-
- name: Run Download Tests
50-
run: |
51-
source .venv/bin/activate
52-
pytest -ra -v -m "download"
53-
coverage report
37+
- name: Run Core Tests
38+
run: poetry run pytest -ra -v -m "not download"

‎.github/workflows/tests-download.yaml

+8-24
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,9 @@ on:
1010

1111
jobs:
1212
tests:
13-
runs-on: ubuntu-latest
13+
runs-on: ubuntu-22.04
1414
strategy:
15+
fail-fast: false
1516
matrix:
1617
python-version: ["3.10"] # only run expensive downloads on one (lowest) python version
1718
defaults:
@@ -21,34 +22,17 @@ jobs:
2122
steps:
2223
- uses: actions/checkout@v4
2324

25+
- name: Install poetry
26+
run: pipx install poetry
27+
2428
- name: Set up Python ${{ matrix.python-version }}
2529
uses: actions/setup-python@v5
2630
with:
2731
python-version: ${{ matrix.python-version }}
28-
29-
- name: Install Poetry
30-
uses: snok/install-poetry@v1
31-
with:
32-
virtualenvs-create: true
33-
virtualenvs-in-project: true
34-
virtualenvs-path: .venv
35-
36-
- name: Load cached venv
37-
id: cached-poetry-dependencies
38-
uses: actions/cache@v4
39-
with:
40-
path: .venv
41-
key: venv-${{ runner.os }}-${{ steps.setup-python.outputs.python-version }}-${{ hashFiles('**/poetry.lock') }}-dev
32+
cache: 'poetry'
4233

4334
- name: Install dependencies
44-
if: steps.cached-poetry-dependencies.outputs.cache-hit != 'true'
45-
run: poetry install --no-interaction --no-root --with dev
46-
47-
- name: Install project
48-
run: poetry install --no-interaction
35+
run: poetry install --no-interaction --with dev
4936

5037
- name: Run Download Tests
51-
run: |
52-
source .venv/bin/activate
53-
pytest -ra -v -m "download"
54-
coverage report
38+
run: poetry run pytest -ra -v -m "download"

0 commit comments

Comments
 (0)
Please sign in to comment.