parent
b8ddaef967
commit
00ee3fad34
|
|
@ -83,13 +83,11 @@ 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"
|
||||
|
|
|
|||
|
|
@ -9,7 +9,8 @@ RUN pacman -Suyy --noconfirm \
|
|||
python-distlib \
|
||||
qt5-base \
|
||||
qt5-declarative \
|
||||
{% if webengine %}qt5-webengine python-pyqtwebengine{% else %}qt5-webkit{% endif %} \
|
||||
qt5-webengine \
|
||||
python-pyqtwebengine \
|
||||
python-pyqt5 \
|
||||
xorg-xinit \
|
||||
xorg-server-xvfb \
|
||||
|
|
|
|||
|
|
@ -31,9 +31,8 @@ def main():
|
|||
|
||||
image = sys.argv[1]
|
||||
config = {
|
||||
'archlinux-webkit': {'webengine': False, 'unstable': False},
|
||||
'archlinux-webengine': {'webengine': True, 'unstable': False},
|
||||
'archlinux-webengine-unstable': {'webengine': True, 'unstable': True},
|
||||
'archlinux-webengine': {'unstable': False},
|
||||
'archlinux-webengine-unstable': {'unstable': True},
|
||||
}[image]
|
||||
|
||||
with open('Dockerfile', 'w') as f:
|
||||
|
|
|
|||
Loading…
Reference in New Issue