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

Update action versions and EDM version #183

Merged
merged 3 commits into from
Mar 8, 2024
Merged

Update action versions and EDM version #183

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0b01e7b
Update action versions and EDM version
mdickinson Mar 1, 2024
2464e14
Merge branch 'main' into maint/update-workflow-versions
mdickinson Mar 1, 2024
9d34cae
Merge branch 'main' into maint/update-workflow-versions
mdickinson Mar 8, 2024
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
12 changes: 5 additions & 7 deletions .github/workflows/bleeding-edge.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
- cron: '0 0 * * 5'

env:
INSTALL_EDM_VERSION: 3.3.1
INSTALL_EDM_VERSION: 3.7.0

jobs:

Expand All @@ -19,14 +19,14 @@ jobs:
runtime: ['3.6', '3.8']
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Cache EDM packages
uses: actions/cache@v2
uses: actions/cache@v4
with:
path: ~/.cache
key: ${{ runner.os }}-${{ hashFiles('etstool.py') }}
- name: Set up EDM
uses: enthought/setup-edm-action@v1
uses: enthought/setup-edm-action@v3
with:
edm-version: ${{ env.INSTALL_EDM_VERSION }}
- name: Install click to the default EDM environment
Expand All @@ -42,6 +42,4 @@ jobs:
edm run -- python -m pip install --force-reinstall "git+http://github.com/enthought/traits.git#egg=traits"
edm run -- python -m pip install --force-reinstall scipy
- name: Run tests
uses: GabrielBB/xvfb-action@v1
with:
run: edm run -- python etstool.py test --runtime=${{ matrix.runtime }}
run: edm run -- python etstool.py test --runtime=${{ matrix.runtime }}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You probably need to use xvfb-run -a here to run in a framebuffer, but I note that we're not installing either Qt or Wx so this won't actually do any GUI tests anyway.

Possibly open an issue for this?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Right - I considered this (see the description), but we don't need a framebuffer at all for these tests, it doesn't seem worth it.

Possibly open an issue for this?

You mean for installing Qt (or Wx) for test run purposes? Do we even have any tests that exercise the GUI? Nothing appears to be being skipped in the test run.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm. I see that our PyPI-based workflow does do the Ubuntu / non-Ubuntu split, but now I'm wondering why.

12 changes: 6 additions & 6 deletions .github/workflows/release-to-pypi.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,24 +16,24 @@ jobs:
steps:

- name: Check out the release commit
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Set up QEMU
uses: docker/setup-qemu-action@v2
uses: docker/setup-qemu-action@v3
with:
platforms: arm64
if: runner.os == 'Linux'

- name: Set up Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: '3.10'

- name: Install Python packages needed for wheel build and upload
run: python -m pip install twine

- name: Build wheels
uses: pypa/cibuildwheel@v2.9.0
uses: pypa/cibuildwheel@v2.16.5

- name: Check and upload wheels
env:
Expand All @@ -49,10 +49,10 @@ jobs:
steps:

- name: Check out the release commit
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Set up Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: '3.10'

Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/test-with-edm.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
- cron: '0 0 * * 5'

env:
INSTALL_EDM_VERSION: 3.5.0
INSTALL_EDM_VERSION: 3.7.0

jobs:

Expand All @@ -20,14 +20,14 @@ jobs:
runtime: ['3.6', '3.8']
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Cache EDM packages
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ~/.cache
key: ${{ runner.os }}-${{ hashFiles('etstool.py') }}
- name: Set up EDM
uses: enthought/setup-edm-action@v2
uses: enthought/setup-edm-action@v3
with:
edm-version: ${{ env.INSTALL_EDM_VERSION }}
- name: Install click to the default EDM environment
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test-with-pypi.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ jobs:
runs-on: ${{ matrix.os }}
steps:
- name: Clone the SciMath source
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
- name: Install package under test
Expand Down