diff options
| author | Florian Bruhin <me@the-compiler.org> | 2022-05-19 15:35:12 +0200 |
|---|---|---|
| committer | Florian Bruhin <me@the-compiler.org> | 2022-06-22 17:41:12 +0200 |
| commit | 7a0c2f49da851e5be4ef1e9c805f4a30380351cb (patch) | |
| tree | 376936ae34db32d5f6b9b0e38d40b7f787d1caa5 | |
| parent | e3aad763dfe0b8f6c8f29df35977e8ab8de8f6cb (diff) | |
| download | qutebrowser-7a0c2f49da851e5be4ef1e9c805f4a30380351cb.tar.gz qutebrowser-7a0c2f49da851e5be4ef1e9c805f4a30380351cb.zip | |
ci: Prepare Qt 6 dockerfiles
| -rw-r--r-- | .github/workflows/ci.yml | 1 | ||||
| -rw-r--r-- | scripts/dev/ci/docker/Dockerfile.j2 | 9 | ||||
| -rw-r--r-- | scripts/dev/ci/docker/generate.py | 7 |
3 files changed, 13 insertions, 4 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1aa062a91..95a52a829 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -77,6 +77,7 @@ jobs: image: - archlinux-webkit - archlinux-webengine + # - archlinux-webengine-qt6 # FIXME:qt6 activate # - archlinux-webengine-unstable container: image: "qutebrowser/ci:${{ matrix.image }}" diff --git a/scripts/dev/ci/docker/Dockerfile.j2 b/scripts/dev/ci/docker/Dockerfile.j2 index c30141216..1af90283c 100644 --- a/scripts/dev/ci/docker/Dockerfile.j2 +++ b/scripts/dev/ci/docker/Dockerfile.j2 @@ -7,10 +7,17 @@ RUN pacman -Suyy --noconfirm \ git \ python-tox \ python-distlib \ + {% if qt6 %} + qt6-base \ + qt6-declarative \ + {% if webengine %}qt6-webengine python-pyqt6-webengine{% else %}{{ 1/0 }}{% endif %} \ + python-pyqt6 \ + {% else %} qt5-base \ qt5-declarative \ - {% if webengine %}qt5-webengine python-pyqtwebengine{% else %}qt5-webkit{% endif %} \ + {% if webengine %}qt5-webengine python-pyqt5-webengine{% else %}qt5-webkit{% endif %} \ python-pyqt5 \ + {% 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..00ba34a78 100644 --- a/scripts/dev/ci/docker/generate.py +++ b/scripts/dev/ci/docker/generate.py @@ -31,9 +31,10 @@ 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-webkit': {'webengine': False, 'unstable': False, 'qt6': False}, + 'archlinux-webengine': {'webengine': True, 'unstable': False, 'qt6': False}, + 'archlinux-webengine-qt6': {'webengine': True, 'unstable': False, 'qt6': True}, + 'archlinux-webengine-unstable': {'webengine': True, 'unstable': True, 'qt6': False}, }[image] with open('Dockerfile', 'w') as f: |