diff options
| author | Florian Bruhin <me@the-compiler.org> | 2022-11-14 21:24:03 +0100 |
|---|---|---|
| committer | Florian Bruhin <me@the-compiler.org> | 2022-11-14 21:24:03 +0100 |
| commit | 00ee3fad34cdabdab3e3b631191bafa0e5199e9f (patch) | |
| tree | 9eb0cf62472cbdc320b05c2e14eaa360905cd438 | |
| parent | b8ddaef967700fb581e6150b72ec990edb9abafa (diff) | |
| download | qutebrowser-00ee3fad34cdabdab3e3b631191bafa0e5199e9f.tar.gz qutebrowser-00ee3fad34cdabdab3e3b631191bafa0e5199e9f.zip | |
ci: Drop QtWebKit
See #7478, #4039
| -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, 4 insertions, 6 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3bebcfbc4..800d08111 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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" diff --git a/scripts/dev/ci/docker/Dockerfile.j2 b/scripts/dev/ci/docker/Dockerfile.j2 index c30141216..d98443b07 100644 --- a/scripts/dev/ci/docker/Dockerfile.j2 +++ b/scripts/dev/ci/docker/Dockerfile.j2 @@ -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 \ diff --git a/scripts/dev/ci/docker/generate.py b/scripts/dev/ci/docker/generate.py index 2ab25f325..0d197a7e0 100644 --- a/scripts/dev/ci/docker/generate.py +++ b/scripts/dev/ci/docker/generate.py @@ -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: |