From a19634474246739027f826968ea34e720c0ec987 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <me@the-compiler.org>
Date: Tue, 15 Aug 2023 19:31:36 +0200
Subject: ci: Use proper image for Qt 6 bleeding tests

---
 .github/workflows/bleeding.yml      | 18 ++++++++++--------
 scripts/dev/ci/docker/Dockerfile.j2 |  1 -
 tox.ini                             |  3 +--
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/bleeding.yml b/.github/workflows/bleeding.yml
index 93966b9e7..8f8cddc1e 100644
--- a/.github/workflows/bleeding.yml
+++ b/.github/workflows/bleeding.yml
@@ -12,23 +12,25 @@ jobs:
     if: "github.repository == 'qutebrowser/qutebrowser'"
     runs-on: ubuntu-20.04
     timeout-minutes: 45
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - testenv: bleeding
+            image: "archlinux-webengine-unstable-qt6"
+          - testenv: bleeding-qt5
+            image: "archlinux-webengine-unstable"
     container:
-      image: "qutebrowser/ci:archlinux-webengine-unstable"
+      image: "qutebrowser/ci:${{ matrix.image }}"
       env:
         FORCE_COLOR: "1"
         PY_COLORS: "1"
-        DOCKER: "archlinux-webengine-unstable"
+        DOCKER: "${{ matrix.image }}"
         CI: true
       volumes:
         # Hardcoded because we can't use ${{ runner.temp }} here apparently.
         - /home/runner/work/_temp/:/home/runner/work/_temp/
       options: --privileged --tty
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - testenv: bleeding
-          - testenv: bleeding-qt5
     steps:
       - uses: actions/checkout@v3
         with:
diff --git a/scripts/dev/ci/docker/Dockerfile.j2 b/scripts/dev/ci/docker/Dockerfile.j2
index 0ec4a5177..3a1adbdef 100644
--- a/scripts/dev/ci/docker/Dockerfile.j2
+++ b/scripts/dev/ci/docker/Dockerfile.j2
@@ -18,7 +18,6 @@ RUN pacman -Su --noconfirm \
         qt6-webengine python-pyqt6-webengine \
       {% else %}{{ 1/0 }}{% endif %}
       python-pyqt6 \
-      xcb-util-cursor \
     {% else %}
       qt5-base \
       qt5-declarative \
diff --git a/tox.ini b/tox.ini
index d3c0b797a..cd26e19a9 100644
--- a/tox.ini
+++ b/tox.ini
@@ -67,13 +67,12 @@ basepython = {env:PYTHON:python3}
 setenv =
     qt5: PYTEST_QT_API=pyqt5
     qt5: QUTE_QT_WRAPPER=PyQt5
-    QT_DEBUG_PLUGINS=1
 pip_pre = true
 deps = -r{toxinidir}/misc/requirements/requirements-tests-bleeding.txt
 commands_pre =
     qt5: pip install --index-url https://www.riverbankcomputing.com/pypi/simple/ --pre --upgrade PyQt5 PyQtWebEngine
     !qt5: pip install --index-url https://www.riverbankcomputing.com/pypi/simple/ --pre --upgrade PyQt6 PyQt6-WebEngine
-commands = {envpython} -bb -m pytest {posargs:tests} -s
+commands = {envpython} -bb -m pytest {posargs:tests}
 
 # other envs
 
-- 
cgit v1.2.3-54-g00ecf