diff options
| author | Florian Bruhin <me@the-compiler.org> | 2022-11-16 09:28:38 +0100 |
|---|---|---|
| committer | Florian Bruhin <me@the-compiler.org> | 2022-11-16 09:28:38 +0100 |
| commit | f0489cb6a5df8e9ccbf675d8c5d37fbcaca4d844 (patch) | |
| tree | b5963a369f306383646f652ace1dc09581539808 | |
| parent | 0cd682afbdbc6d9f21ca2d8c19641b32009fc6b5 (diff) | |
| download | qutebrowser-f0489cb6a5df8e9ccbf675d8c5d37fbcaca4d844.tar.gz qutebrowser-f0489cb6a5df8e9ccbf675d8c5d37fbcaca4d844.zip | |
ci: Keep QtWebKit on live support a bit longer
See #7478, #4039
| -rw-r--r-- | scripts/dev/ci/docker/Dockerfile.j2 | 7 | ||||
| -rw-r--r-- | 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 = { |