Revert "ci: Drop QtWebKit"

This reverts commit 00ee3fad34.
This commit is contained in:
Florian Bruhin 2022-11-16 09:10:42 +01:00
parent d4397b6b63
commit 0cd682afbd
3 changed files with 6 additions and 4 deletions

View File

@ -83,11 +83,13 @@ jobs:
fail-fast: false
matrix:
image:
- archlinux-webkit
- archlinux-webengine
# - archlinux-webengine-unstable
container:
image: "qutebrowser/ci:${{ matrix.image }}"
env:
QUTE_BDD_WEBENGINE: "${{ matrix.image != 'archlinux-webkit' }}"
DOCKER: "${{ matrix.image }}"
CI: true
PYTEST_ADDOPTS: "--color=yes"

View File

@ -9,8 +9,7 @@ RUN pacman -Suyy --noconfirm \
python-distlib \
qt5-base \
qt5-declarative \
qt5-webengine \
python-pyqtwebengine \
{% if webengine %}qt5-webengine python-pyqtwebengine{% else %}qt5-webkit{% endif %} \
python-pyqt5 \
xorg-xinit \
xorg-server-xvfb \

View File

@ -31,8 +31,9 @@ def main():
image = sys.argv[1]
config = {
'archlinux-webengine': {'unstable': False},
'archlinux-webengine-unstable': {'unstable': True},
'archlinux-webkit': {'webengine': False, 'unstable': False},
'archlinux-webengine': {'webengine': True, 'unstable': False},
'archlinux-webengine-unstable': {'webengine': True, 'unstable': True},
}[image]
with open('Dockerfile', 'w') as f: