Skip to content

Commit c038071

Browse files
committed
Simplify
1 parent f4d42fc commit c038071

File tree

1 file changed

+6
-25
lines changed

1 file changed

+6
-25
lines changed

.github/workflows/run-tests.yml

Lines changed: 6 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,8 @@ jobs:
8080
include-hidden-files: true
8181
if-no-files-found: error
8282

83+
# Neither Tox nor Poetry have any real support for GraalPy right now, so we're
84+
# just installing using GraalPy's pip and running PyTest manually in the runner.
8385
run-graalpy-tests:
8486
runs-on: ${{matrix.os}}
8587
strategy:
@@ -89,7 +91,6 @@ jobs:
8991
include:
9092
- version: '3.11'
9193
graalpy-version: '24.1.0'
92-
tox-env: py311
9394
steps:
9495
- uses: actions/checkout@v4
9596
- uses: actions/setup-python@v5
@@ -100,35 +101,15 @@ jobs:
100101
uses: actions/cache@v4
101102
with:
102103
path: |
103-
.tox
104104
~/.cache/pip
105-
~/.cache/pypoetry
106-
~/.local/bin/poetry
107-
~/.local/share/pypoetry
108-
key: ${{ runner.os }}-graalpy-${{ matrix.version }}-poetry-${{ hashFiles('.github/workflows/run-tests.yml', 'pyproject.toml', 'tox.ini') }}
109-
- name: Install Poetry
110-
if: steps.cache-deps.outputs.cache-hit != 'true'
111-
run: curl -sSL https://install.python-poetry.org | python3 -
112-
- name: Install Tox
105+
key: ${{ runner.os }}-graalpy-${{ matrix.version }}-pip-${{ hashFiles('.github/workflows/run-tests.yml', 'pyproject.toml', 'tox.ini') }}
106+
- name: Install Basilisp
113107
run: |
114108
pip install -U pip
115-
pip install tox
109+
pip install "pytest>=7.0.0,<9.0.0" "pygments"
116110
- name: Run tests
117-
env:
118-
TOX_PARALLEL_NO_SPINNER: 1
119-
TOX_SHOW_OUTPUT: "True"
120-
TOXENV: ${{ matrix.tox-env }}
121111
run: |
122-
tox run -- -n 2
123-
mkdir coverage
124-
mv .coverage.* "coverage/.coverage.pypy${{ matrix.version }}"
125-
- name: Archive code coverage results
126-
uses: actions/upload-artifact@v4
127-
with:
128-
name: code-coverage.graalpy${{ matrix.version }}
129-
path: coverage/.coverage.py*
130-
include-hidden-files: true
131-
if-no-files-found: error
112+
pytest --import-mode=importlib
132113
133114
run-pypy-tests:
134115
runs-on: ${{matrix.os}}

0 commit comments

Comments
 (0)