Skip to content

Commit c2aa854

Browse files
committed
Split the XVFB step
1 parent 1e377b0 commit c2aa854

1 file changed

Lines changed: 19 additions & 17 deletions

File tree

.github/workflows/main.yml

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -73,29 +73,31 @@ jobs:
7373
version: "0.8.3"
7474
enable-cache: false
7575

76-
- name: Test all Python/Qt combinations
76+
- name: Install XVFB
7777
uses: coactions/setup-xvfb@v1
78-
with:
79-
run: |
80-
PYTHON_VERSIONS=("3.10", "3.11")
81-
QT_VERSIONS=("pyside2", "pyside6", "pyqt5", "pyqt6")
8278

83-
for PY in "${PYTHON_VERSIONS[@]}"; do
84-
uv venv --clear
85-
uv python pin "$PY"
86-
for QT in "${QT_VERSIONS[@]}"; do
79+
- name: Test all Python/Qt combinations
80+
run: |
81+
PYTHON_VERSIONS=("3.10", "3.11")
82+
QT_VERSIONS=("pyside2", "pyside6", "pyqt5", "pyqt6")
83+
84+
for PY in "${PYTHON_VERSIONS[@]}"; do
85+
uv venv --clear
86+
uv python pin "$PY"
87+
for QT in "${QT_VERSIONS[@]}"; do
8788
88-
# pyside2 requires python <3.11
89-
if [[ "$QT" == "pyside2" && ( "$PY" == "3.11" || "$PY" == "3.12" || "$PY" == "3.13" ) ]]; then continue; fi
90-
# pyside6 and pyqt6 require python >=3.9
91-
if [[ "$QT" == "pyside6" || "$QT" == "pyqt6" ]] && [[ "$PY" == "3.8" ]]; then continue; fi
89+
# pyside2 requires python <3.11
90+
if [[ "$QT" == "pyside2" && ( "$PY" == "3.11" || "$PY" == "3.12" || "$PY" == "3.13" ) ]]; then continue; fi
91+
# pyside6 and pyqt6 require python >=3.9
92+
if [[ "$QT" == "pyside6" || "$QT" == "pyqt6" ]] && [[ "$PY" == "3.8" ]]; then continue; fi
9293
93-
uv sync --locked --dev
94-
uv pip install "$QT"
94+
uv sync --locked --dev
95+
uv pip install "$QT"
9596
96-
QT_API="$QT" uv run coverage run -m pytest --verbose tests/
97-
done
97+
QT_API="$QT" /usr/bin/xvfb-run --auto-servernum \
98+
uv run coverage run -m pytest --verbose tests/
9899
done
100+
done
99101
100102
# combine-coverage:
101103
# needs: tests

0 commit comments

Comments
 (0)