diff options
| author | Florian Bruhin <me@the-compiler.org> | 2022-11-16 09:10:42 +0100 |
|---|---|---|
| committer | Florian Bruhin <me@the-compiler.org> | 2022-11-16 09:10:42 +0100 |
| commit | 0cd682afbdbc6d9f21ca2d8c19641b32009fc6b5 (patch) | |
| tree | f278eb510640a9b45733b6defdc7edeeac28b6ca | |
| parent | d4397b6b631effbdb04d732c5ae942495b18e427 (diff) | |
| download | qutebrowser-0cd682afbdbc6d9f21ca2d8c19641b32009fc6b5.tar.gz qutebrowser-0cd682afbdbc6d9f21ca2d8c19641b32009fc6b5.zip | |
Revert "ci: Drop QtWebKit"
This reverts commit 00ee3fad34cdabdab3e3b631191bafa0e5199e9f.
| -rw-r--r-- | .github/workflows/ci.yml | 2 | ||||
| -rw-r--r-- | scripts/dev/ci/docker/Dockerfile.j2 | 3 | ||||
| -rw-r--r-- | scripts/dev/ci/docker/generate.py | 5 |
3 files changed, 6 insertions, 4 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 800d08111..3bebcfbc4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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" diff --git a/scripts/dev/ci/docker/Dockerfile.j2 b/scripts/dev/ci/docker/Dockerfile.j2 index d98443b07..c30141216 100644 --- a/scripts/dev/ci/docker/Dockerfile.j2 +++ b/scripts/dev/ci/docker/Dockerfile.j2 @@ -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 \ diff --git a/scripts/dev/ci/docker/generate.py b/scripts/dev/ci/docker/generate.py index 0d197a7e0..2ab25f325 100644 --- a/scripts/dev/ci/docker/generate.py +++ b/scripts/dev/ci/docker/generate.py @@ -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: |