From 8ec8d23af47e4f718d1b3a0c1f3cbf645c1be649 Mon Sep 17 00:00:00 2001
From: Hugo van Kemenade <hugovk@users.noreply.github.com>
Date: Tue, 3 Nov 2020 18:49:16 +0200
Subject: [PATCH] Install Qt on GHA

---
 .ci/install.sh             | 6 +++---
 .github/workflows/test.yml | 5 +++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/.ci/install.sh b/.ci/install.sh
index 77dccaa4a..db259bdca 100755
--- a/.ci/install.sh
+++ b/.ci/install.sh
@@ -39,13 +39,13 @@ if [ "$GHA_PYTHON_VERSION" == "3.8" ]; then python3 -m pip install -U "setuptool
 if [ "$GHA_PYTHON_VERSION" == "3.9" ]; then python3 -m pip install -U "setuptools>=49.3.2" ; fi
 if [ "$TRAVIS_PYTHON_VERSION" == "pypy3.6-7.3.1" ]; then python3 -m pip install -U "setuptools>=49.3.2" ; fi
 
-if [[ $TRAVIS_PYTHON_VERSION == 3.* ]]; then
+# PyQt5 doesn't support PyPy3
+# Wheel doesn't yet support 3.10
+if [[ $GHA_PYTHON_VERSION == 3.* && $GHA_PYTHON_VERSION != "3.10-dev" ]]; then
   # arm64, ppc64le, s390x CPUs:
   # "ERROR: Could not find a version that satisfies the requirement pyqt5"
-  if [[ $TRAVIS_CPU_ARCH == "amd64" ]]; then
     sudo apt-get -qq install libxcb-xinerama0 pyqt5-dev-tools
     python3 -m pip install pyqt5
-  fi
 fi
 
 # docs only on Python 3.9
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 8403e2ee5..b33b2195a 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -78,8 +78,9 @@ jobs:
         .ci/build.sh
 
     - name: Test
-      run: |
-        .ci/test.sh
+      uses: GabrielBB/xvfb-action@v1
+      with:
+        run: .ci/test.sh
       env:
         PYTHONOPTIMIZE: ${{ matrix.PYTHONOPTIMIZE }}