From 8c09394a2c87621458d5afa91c7a2fcaba55b952 Mon Sep 17 00:00:00 2001
From: Mark Dickinson <mdickinson@enthought.com>
Date: Fri, 13 Jan 2023 09:54:23 +0000
Subject: [PATCH] Switch to ubuntu-22.04 for wxpython run (#494)

This PR fixes the wxPython workflow:

- Use ubuntu-latest instead of ubuntu-20.04 (this also fixes that we
were testing for ubuntu-latest when deciding whether to use xvfb-run or
not)
- Add libnotify.so.4 as a wxPython dependency
- Use the ubuntu-22.04 wheel for wxPython

It also updates the `action/cache` version, in response to warnings.

Test run: https://github.com/enthought/envisage/actions/runs/3854233633

(cherry picked from commit 7e1cde80f1be5df0d5afeabba6846e3522992787)
---
 .github/workflows/ets-from-source.yml | 4 ++--
 .github/workflows/test-with-edm.yml   | 4 ++--
 .github/workflows/test-wx.yml         | 7 ++++---
 etstool.py                            | 4 ++--
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/ets-from-source.yml b/.github/workflows/ets-from-source.yml
index 834c4d49d..30beaf0f3 100644
--- a/.github/workflows/ets-from-source.yml
+++ b/.github/workflows/ets-from-source.yml
@@ -35,12 +35,12 @@ jobs:
       - name: Install packages for Qt support
         uses: ./.github/actions/install-qt-support
       - name: Cache EDM packages
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ~/.cache
           key: ${{ runner.os }}-${{ matrix.runtime }}-${{ matrix.toolkit }}-${{ hashFiles('etstool.py') }}
       - name: Set up EDM
-        uses: enthought/setup-edm-action@v1
+        uses: enthought/setup-edm-action@v2
         with:
           edm-version: ${{ env.INSTALL_EDM_VERSION }}
       - name: Set up bootstrap Python
diff --git a/.github/workflows/test-with-edm.yml b/.github/workflows/test-with-edm.yml
index ade726505..7c6f832b0 100644
--- a/.github/workflows/test-with-edm.yml
+++ b/.github/workflows/test-with-edm.yml
@@ -34,12 +34,12 @@ jobs:
       - name: Install packages for Qt support
         uses: ./.github/actions/install-qt-support
       - name: Cache EDM packages
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ~/.cache
           key: ${{ runner.os }}-${{ matrix.runtime }}-${{ matrix.toolkit }}-${{ hashFiles('etstool.py') }}
       - name: Set up EDM
-        uses: enthought/setup-edm-action@v1
+        uses: enthought/setup-edm-action@v2
         with:
           edm-version: ${{ env.INSTALL_EDM_VERSION }}
       - name: Set up bootstrap Python
diff --git a/.github/workflows/test-wx.yml b/.github/workflows/test-wx.yml
index 92aa007c8..01a769811 100644
--- a/.github/workflows/test-wx.yml
+++ b/.github/workflows/test-wx.yml
@@ -16,7 +16,7 @@ jobs:
   test-with-edm:
     strategy:
       matrix:
-        os: ['ubuntu-20.04']
+        os: ['ubuntu-latest']
         runtime: ['3.8']
         toolkit: ['wx']
 
@@ -29,14 +29,15 @@ jobs:
           sudo apt-get update
           sudo apt-get install libsdl-image1.2
           sudo apt-get install libsdl2-2.0-0
+          sudo apt-get install libnotify4
         if: runner.os == 'Linux'
       - name: Cache EDM packages
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ~/.cache
           key: ${{ runner.os }}-${{ matrix.runtime }}-${{ matrix.toolkit }}-${{ hashFiles('etstool.py') }}
       - name: Set up EDM
-        uses: enthought/setup-edm-action@v1
+        uses: enthought/setup-edm-action@v2
         with:
           edm-version: ${{ env.INSTALL_EDM_VERSION }}
       - name: Set up bootstrap Python
diff --git a/etstool.py b/etstool.py
index 2c9b49e19..729433b09 100644
--- a/etstool.py
+++ b/etstool.py
@@ -222,9 +222,9 @@ def install(edm, runtime, toolkit, environment, editable, source):
     # install wxPython with pip, because we don't have it in EDM
     if toolkit == "wx":
         if sys.platform == "linux":
-            # XXX This assumes Ubuntu 20.04, and targets CI.
+            # XXX This assumes Ubuntu 22.04, and targets CI.
             commands.append(
-                "{edm} run -e {environment} -- python -m pip install -f https://extras.wxpython.org/wxPython4/extras/linux/gtk3/ubuntu-20.04/ wxPython"  # noqa: E501
+                "{edm} run -e {environment} -- python -m pip install -f https://extras.wxpython.org/wxPython4/extras/linux/gtk3/ubuntu-22.04/ wxPython"  # noqa: E501
             )
         else:
             commands.append(