From dd39e0db01a507be4f1352d88d2cf89ef291a7a1 Mon Sep 17 00:00:00 2001
From: Corran Webster <cwebster@enthought.com>
Date: Mon, 23 Jan 2023 14:06:43 +0000
Subject: [PATCH 1/2] Start with older ubuntu version.

---
 .github/workflows/ets-from-source.yml | 2 +-
 .github/workflows/test-with-edm.yml   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ets-from-source.yml b/.github/workflows/ets-from-source.yml
index af80d7484..14971405a 100644
--- a/.github/workflows/ets-from-source.yml
+++ b/.github/workflows/ets-from-source.yml
@@ -16,7 +16,7 @@ jobs:
   test-ets-source-linux:
     strategy:
       matrix:
-        os: [ubuntu-latest]
+        os: [ubuntu-20.04]
         toolkit: ['null', 'pyqt5', 'pyside2']
     runs-on: ${{ matrix.os }}
     steps:
diff --git a/.github/workflows/test-with-edm.yml b/.github/workflows/test-with-edm.yml
index f3c7106ea..df318b197 100644
--- a/.github/workflows/test-with-edm.yml
+++ b/.github/workflows/test-with-edm.yml
@@ -16,7 +16,7 @@ jobs:
     strategy:
       matrix:
         toolkit: ['null', 'pyqt5', 'pyside2']
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v2
       - name: Install Qt dependencies for Linux

From ef9ccee791234c23fa348829ec0db878c3ebc222 Mon Sep 17 00:00:00 2001
From: Corran Webster <cwebster@enthought.com>
Date: Mon, 23 Jan 2023 14:15:51 +0000
Subject: [PATCH 2/2] Update to newer ubuntu version; change apt commands and
 assume xvfb installed.

---
 .github/workflows/test-with-edm.yml | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/test-with-edm.yml b/.github/workflows/test-with-edm.yml
index df318b197..6e7a582af 100644
--- a/.github/workflows/test-with-edm.yml
+++ b/.github/workflows/test-with-edm.yml
@@ -16,21 +16,23 @@ jobs:
     strategy:
       matrix:
         toolkit: ['null', 'pyqt5', 'pyside2']
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
       - name: Install Qt dependencies for Linux
         run: |
           sudo apt-get update
-          sudo apt-get install qt5-default
+          sudo apt-get install libegl1
           sudo apt-get install libxkbcommon-x11-0
-          sudo apt-get install libglu1-mesa-dev
           sudo apt-get install libxcb-icccm4
           sudo apt-get install libxcb-image0
           sudo apt-get install libxcb-keysyms1
           sudo apt-get install libxcb-randr0
           sudo apt-get install libxcb-render-util0
           sudo apt-get install libxcb-xinerama0
+          sudo apt-get install libxcb-shape0
+          # Needed to work around https://bugreports.qt.io/browse/PYSIDE-1547
+          sudo apt-get install libopengl0
         if: matrix.toolkit != 'null'
       - name: Cache EDM packages
         uses: actions/cache@v2
@@ -49,11 +51,7 @@ jobs:
         run: edm run -- python ci/edmtool.py flake8 --toolkit=${{ matrix.toolkit }}
         if: matrix.toolkit == 'null'
       - name: Run tests
-        uses: GabrielBB/xvfb-action@v1
-        with:
-          # kiva agg requires at least 15-bit color depth.
-          # The --server-args assumes xvfb-run is called, hence Linux only.
-          run: --server-args="-screen 0 1024x768x24" edm run -- python ci/edmtool.py test --toolkit=${{ matrix.toolkit }}
+        run: xvfb-run --server-args="-screen 0 1024x768x24" edm run -- python ci/edmtool.py test --toolkit=${{ matrix.toolkit }}
 
   # Test against EDM packages on Windows and OSX
   test-with-edm: