From f0489cb6a5df8e9ccbf675d8c5d37fbcaca4d844 Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Wed, 16 Nov 2022 09:28:38 +0100 Subject: ci: Keep QtWebKit on live support a bit longer See #7478, #4039 --- scripts/dev/ci/docker/Dockerfile.j2 | 7 ++++++- scripts/dev/ci/docker/generate.py | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/scripts/dev/ci/docker/Dockerfile.j2 b/scripts/dev/ci/docker/Dockerfile.j2 index c30141216..5c8aa4404 100644 --- a/scripts/dev/ci/docker/Dockerfile.j2 +++ b/scripts/dev/ci/docker/Dockerfile.j2 @@ -9,8 +9,13 @@ RUN pacman -Suyy --noconfirm \ python-distlib \ qt5-base \ qt5-declarative \ - {% if webengine %}qt5-webengine python-pyqtwebengine{% else %}qt5-webkit{% endif %} \ + {% if webengine %} + qt5-webengine python-pyqtwebengine \ python-pyqt5 \ + {% else %} + https://archive.archlinux.org/packages/q/qt5-webkit/qt5-webkit-5.212.0alpha4-18-x86_64.pkg.tar.zst \ + https://archive.archlinux.org/packages/p/python-pyqt5/python-pyqt5-5.15.7-2-x86_64.pkg.tar.zst \ + {% endif %} xorg-xinit \ xorg-server-xvfb \ ttf-bitstream-vera \ diff --git a/scripts/dev/ci/docker/generate.py b/scripts/dev/ci/docker/generate.py index 2ab25f325..34619a668 100644 --- a/scripts/dev/ci/docker/generate.py +++ b/scripts/dev/ci/docker/generate.py @@ -27,7 +27,7 @@ import jinja2 def main(): with open('Dockerfile.j2') as f: - template = jinja2.Template(f.read()) + template = jinja2.Template(f.read(), trim_blocks=True, lstrip_blocks=True) image = sys.argv[1] config = { -- cgit v1.2.3-54-g00ecf