diff options
| author | Florian Bruhin <me@the-compiler.org> | 2023-05-31 11:22:14 +0200 |
|---|---|---|
| committer | Florian Bruhin <me@the-compiler.org> | 2023-05-31 11:22:14 +0200 |
| commit | 839c8b6fe9b4a79e2ec060e852331ba74a5ad936 (patch) | |
| tree | 224c25032ddf887383872717c9cf60eb90003afb | |
| parent | f26ea37c4132a90dea4cd9ff321995f65315b351 (diff) | |
| download | qutebrowser-839c8b6fe9b4a79e2ec060e852331ba74a5ad936.tar.gz qutebrowser-839c8b6fe9b4a79e2ec060e852331ba74a5ad936.zip | |
ci: Keep QtWebKit on life support, part 2
Since Archlinux upgraded to Python 3.11, we need to downgrade Python
to 3.10 too, and install tox via pip instead.
This starts becoming somewhat questionable, but if this approach still
does indeed work, let's go for it.
| -rw-r--r-- | scripts/dev/ci/docker/Dockerfile.j2 | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/scripts/dev/ci/docker/Dockerfile.j2 b/scripts/dev/ci/docker/Dockerfile.j2 index 6a06faf82..1c11ff785 100644 --- a/scripts/dev/ci/docker/Dockerfile.j2 +++ b/scripts/dev/ci/docker/Dockerfile.j2 @@ -7,8 +7,10 @@ RUN sed -i '/^# after the header/a[kde-unstable]\nInclude = /etc/pacman.d/mirror RUN pacman -Sy --noconfirm archlinux-keyring RUN pacman -Su --noconfirm \ git \ + {% if not webengine %} python-tox \ python-distlib \ + {% endif %} {% if qt6 %} qt6-base \ qt6-declarative \ @@ -20,9 +22,10 @@ RUN pacman -Su --noconfirm \ qt5-base \ qt5-declarative \ {% if webengine %} - qt5-webengine python-pyqtwebengine \ + qt5-webengine \ + python-pyqtwebengine \ + python-pyqt5 \ {% endif %} - python-pyqt5 \ {% endif %} xorg-xinit \ xorg-server-xvfb \ @@ -34,7 +37,9 @@ RUN pacman -Su --noconfirm \ {% if not webengine %} RUN pacman -U --noconfirm \ 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 + https://archive.archlinux.org/packages/p/python-pyqt5/python-pyqt5-5.15.7-2-x86_64.pkg.tar.zst \ + https://archive.archlinux.org/packages/p/python/python-3.10.10-1-x86_64.pkg.tar.zst +RUN pip install tox {% endif %} {% if qt6 %} |