ci: Use proper image for Qt 6 bleeding tests

This commit is contained in:
Florian Bruhin 2023-08-15 19:31:36 +02:00
parent b55a9f794b
commit a196344742
3 changed files with 14 additions and 14 deletions

View File

@ -12,23 +12,25 @@ jobs:
if: "github.repository == 'qutebrowser/qutebrowser'"
runs-on: ubuntu-20.04
timeout-minutes: 45
container:
image: "qutebrowser/ci:archlinux-webengine-unstable"
env:
FORCE_COLOR: "1"
PY_COLORS: "1"
DOCKER: "archlinux-webengine-unstable"
CI: true
volumes:
# Hardcoded because we can't use ${{ runner.temp }} here apparently.
- /home/runner/work/_temp/:/home/runner/work/_temp/
options: --privileged --tty
strategy:
fail-fast: false
matrix:
include:
- testenv: bleeding
image: "archlinux-webengine-unstable-qt6"
- testenv: bleeding-qt5
image: "archlinux-webengine-unstable"
container:
image: "qutebrowser/ci:${{ matrix.image }}"
env:
FORCE_COLOR: "1"
PY_COLORS: "1"
DOCKER: "${{ matrix.image }}"
CI: true
volumes:
# Hardcoded because we can't use ${{ runner.temp }} here apparently.
- /home/runner/work/_temp/:/home/runner/work/_temp/
options: --privileged --tty
steps:
- uses: actions/checkout@v3
with:

View File

@ -18,7 +18,6 @@ RUN pacman -Su --noconfirm \
qt6-webengine python-pyqt6-webengine \
{% else %}{{ 1/0 }}{% endif %}
python-pyqt6 \
xcb-util-cursor \
{% else %}
qt5-base \
qt5-declarative \

View File

@ -67,13 +67,12 @@ basepython = {env:PYTHON:python3}
setenv =
qt5: PYTEST_QT_API=pyqt5
qt5: QUTE_QT_WRAPPER=PyQt5
QT_DEBUG_PLUGINS=1
pip_pre = true
deps = -r{toxinidir}/misc/requirements/requirements-tests-bleeding.txt
commands_pre =
qt5: pip install --index-url https://www.riverbankcomputing.com/pypi/simple/ --pre --upgrade PyQt5 PyQtWebEngine
!qt5: pip install --index-url https://www.riverbankcomputing.com/pypi/simple/ --pre --upgrade PyQt6 PyQt6-WebEngine
commands = {envpython} -bb -m pytest {posargs:tests} -s
commands = {envpython} -bb -m pytest {posargs:tests}
# other envs