From 3a41abd78e19542439866550f8a1ec60d907111b Mon Sep 17 00:00:00 2001
From: Thomas VINCENT <thomas.vincent@esrf.fr>
Date: Fri, 30 Aug 2024 09:37:30 +0200
Subject: [PATCH] try simpler x config

---
 .github/workflows/ci.yml | 19 +------------------
 1 file changed, 1 insertion(+), 18 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a587d508a0..4b3f6e0b40 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -84,7 +84,7 @@ jobs:
         if: runner.os == 'Linux'
         run: |
           sudo apt-get update
-          sudo apt-get install libegl1-mesa ocl-icd-opencl-dev intel-opencl-icd libgl1-mesa-glx xserver-xorg-video-dummy libxkbcommon-x11-0 libxkbcommon0 libxkbcommon-dev libxcb-icccm4 libxcb-image0 libxcb-shm0 libxcb-keysyms1 libxcb-randr0 libxcb-render-util0 libxcb-render0 libxcb-shape0 libxcb-sync1 libxcb-xfixes0 libxcb-xinerama0 libxcb-xkb1 libxcb-cursor0 libxcb1
+          sudo apt-get install xvfb libegl1-mesa ocl-icd-opencl-dev intel-opencl-icd libgl1-mesa-glx xserver-xorg-video-dummy libxkbcommon-x11-0 libxkbcommon0 libxkbcommon-dev libxcb-icccm4 libxcb-image0 libxcb-shm0 libxcb-keysyms1 libxcb-randr0 libxcb-render-util0 libxcb-render0 libxcb-shape0 libxcb-sync1 libxcb-xfixes0 libxcb-xinerama0 libxcb-xkb1 libxcb-cursor0 libxcb1
 
       # Runs a single command using the runners shell
       - name: Set up Python
@@ -93,11 +93,6 @@ jobs:
           python-version: ${{ matrix.python-version }}
           cache: "pip"
 
-      - name: Install mesa OpenGL
-        if: runner.os == 'Windows'
-        run: |
-          curl -fsS -o opengl32.dll https://www.silx.org/pub/silx/continuous_integration/opengl32_mingw-mesa-x86_64.dll
-
       - name: Upgrade distribution modules
         run: |
           python -m pip install --upgrade pip
@@ -137,19 +132,7 @@ jobs:
           python ./ci/info_platform.py
           pip list
 
-      # For Linux: Start X server with dummy video dirver
-      # Use this instead of Xvfb to have RANDR extension
-      # Otherwise there is a bug with Qt5.10.0
       - name: Run the tests
         run: |
-          if [ ${{ runner.os }} == 'Linux' ]; then
-              export OCL_ICD_VENDORS=$(pwd)/intel_opencl_icd/vendors
-              export DISPLAY=:99.0
-              Xorg -noreset +extension GLX +extension RANDR +extension RENDER -logfile ./99.log -config ./ci/xorg.conf :99 &
-              sleep 3
-          fi
-          if [ ${{ runner.os }} != 'Windows' ]; then
-              export WITH_GL_TEST=False
-          fi
           export QT_API=${{ matrix.QT_API }}
           python -c "import silx.test, sys; sys.exit(silx.test.run_tests(verbosity=1, args=('--low-mem', '--qt-binding=${{ matrix.QT_API }}')));"