diff options
| author | toofar <toofar@spalge.com> | 2022-11-20 16:15:06 +1300 |
|---|---|---|
| committer | toofar <toofar@spalge.com> | 2022-11-20 16:15:06 +1300 |
| commit | ca667d642987a846e54b808362729a1f0b8aef07 (patch) | |
| tree | 983ad7c58341f29182cef4072dc1e2567c7613dc | |
| parent | 2d6646619449d0baa72b35c9e88a3cc8f7c0b790 (diff) | |
| download | qutebrowser-ca667d642987a846e54b808362729a1f0b8aef07.tar.gz qutebrowser-ca667d642987a846e54b808362729a1f0b8aef07.zip | |
Fixup dockerfile template for qt6 configurations
The merge resolution I did in 2d6646619449 was a bit hasty. Hopefully
all supported configurations should work now.
| -rw-r--r-- | scripts/dev/ci/docker/Dockerfile.j2 | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/scripts/dev/ci/docker/Dockerfile.j2 b/scripts/dev/ci/docker/Dockerfile.j2 index 90804d08e..cc66f37d7 100644 --- a/scripts/dev/ci/docker/Dockerfile.j2 +++ b/scripts/dev/ci/docker/Dockerfile.j2 @@ -10,13 +10,16 @@ RUN pacman -Suyy --noconfirm \ {% if qt6 %} qt6-base \ qt6-declarative \ - {% if webengine %}qt6-webengine python-pyqt6-webengine{% else %}{{ 1/0 }}{% endif %} \ + {% if webengine %} + qt6-webengine python-pyqt6-webengine \ + {% else %}{{ 1/0 }}{% endif %} python-pyqt6 \ {% else %} qt5-base \ qt5-declarative \ {% if webengine %} qt5-webengine python-pyqtwebengine \ + {% endif %} python-pyqt5 \ {% endif %} xorg-xinit \ @@ -32,10 +35,15 @@ RUN pacman -U --noconfirm \ https://archive.archlinux.org/packages/p/python-pyqt5/python-pyqt5-5.15.7-2-x86_64.pkg.tar.zst {% endif %} +{% if qt6 %} + {% set pyqt_module = 'PyQt6' %} +{% else %} + {% set pyqt_module = 'PyQt5' %} +{% endif %} {% if webengine %} -RUN python3 -c "from PyQt5 import QtWebEngineCore, QtWebEngineWidgets" + RUN python3 -c "from {{ pyqt_module }} import QtWebEngineCore, QtWebEngineWidgets" {% else %} -RUN python3 -c "from PyQt5 import QtWebKit, QtWebKitWidgets" + RUN python3 -c "from {{ pyqt_module }} import QtWebKit, QtWebKitWidgets" {% endif %} RUN useradd user -u 1001 && \ |