Skip to content

Commit c936ee3

Browse files
committed
Refactor test.yml
1 parent 3235e75 commit c936ee3

File tree

1 file changed

+15
-13
lines changed

1 file changed

+15
-13
lines changed

.github/workflows/test.yml

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -48,32 +48,33 @@ jobs:
4848

4949
steps:
5050
- uses: actions/checkout@v3
51+
- name: Setup Poetry
52+
run: |
53+
pipx install poetry
54+
poetry config virtualenvs.in-project true
5155
- uses: actions/setup-python@v4
56+
id: setup-python
5257
with:
5358
python-version: ${{ matrix.py }}
5459

55-
- name: Cache ./.venv
60+
- name: Cache ./.venv (poetry dependencies)
5661
id: cache-venv
57-
uses: actions/cache@v3.0.11
62+
uses: actions/cache@v3
5863
with:
5964
path: .venv
60-
key: |
65+
key: "\
6166
venv-\
62-
${{ runner.os }}-\
63-
${{ env.pythonLocation }}-\
64-
${{ matrix.qt }}-\
65-
${{ hashFiles('**/poetry.lock') }}
66-
67-
- uses: snok/install-poetry@v1
68-
with:
69-
virtualenvs-in-project: true
67+
${{ runner.os }}-\
68+
${{ steps.setup-python.outputs.python-version }}-\
69+
${{ matrix.qt }}-\
70+
${{ hashFiles('**/poetry.lock') }}"
7071

7172
- name: Install dependencies
7273
if: steps.cache-venv.outputs.cache-hit != 'true'
7374
run: poetry install --only dev,github-actions,test,main
7475

7576
- name: Install Qt dependencies
76-
if: matrix.qt != 'none' && steps.cache-venv.outputs.cache-hit != 'true'
77+
if: matrix.qt != 'none'
7778
run: poetry run pip install -U ${{ matrix.qt }}
7879

7980
- name: Install Linux dependencies
@@ -82,7 +83,8 @@ jobs:
8283
sudo apt-get update -y
8384
sudo apt-get install --no-install-recommends -y \
8485
libxkbcommon-x11-0 \
85-
x11-utils libyaml-dev \
86+
x11-utils \
87+
libyaml-dev \
8688
libegl1-mesa \
8789
libxcb-icccm4 \
8890
libxcb-image0 \

0 commit comments

Comments
 (0)