Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Switch to ubuntu-22.04 for wxpython run #494

Merged
merged 4 commits into from
Jan 13, 2023
Merged

Switch to ubuntu-22.04 for wxpython run #494

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
01583ce
Switch to ubuntu-22.04 for wxpython run
mdickinson Jan 6, 2023
a15fca6
apt-get libnotify4
mdickinson Jan 6, 2023
127e8b8
Update actions/cache version to silence warnings
mdickinson Jan 9, 2023
a8b4516
Also update the version of setup-edm-action that we're using
mdickinson Jan 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/ets-from-source.yml
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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