Skip to content

Commit

Permalink
Switch to ubuntu-22.04 for wxpython run (#494)
Browse files Browse the repository at this point in the history
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 7e1cde8)
  • Loading branch information
mdickinson committed Feb 7, 2023
1 parent 1ff38aa commit 8c09394
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 9 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ets-from-source.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test-with-edm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 4 additions & 3 deletions .github/workflows/test-wx.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
test-with-edm:
strategy:
matrix:
os: ['ubuntu-20.04']
os: ['ubuntu-latest']
runtime: ['3.8']
toolkit: ['wx']

Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions etstool.py
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down

0 comments on commit 8c09394

Please sign in to comment.