Skip to content
Merged
Changes from 1 commit
Commits
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: 4 additions & 8 deletions .github/workflows/ets-from-source.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,11 @@ jobs:
test-with-edm:
strategy:
matrix:
os: [ubuntu-latest, macos-latest, windows-latest]
os: [ubuntu-latest, windows-latest]
toolkit: ['pyside6']
runtime: ['3.8']

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

Added for parity with the test-with-edm workflow, and to ease adding 3.11 testing later on (when the necessary dependencies are present in EDS).

timeout-minutes: 20
runs-on: ${{ matrix.os }}
env:

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

I don't remember why this was originally necessary, but I don't think we need it any more - similar blocks have been removed in EDM-using workflows for other ETS packages.

If this removal succeeds, I'll also update in other workflows.

# Set root directory, mainly for Windows, so that the EDM Python
# environment lives in the same drive as the cloned source. Otherwise
# 'pip install' raises an error while trying to compute
# relative path between the site-packages and the source directory.
EDM_ROOT_DIRECTORY: ${{ github.workspace }}/.edm
steps:
- uses: actions/checkout@v4
- name: Install Qt dependencies
Expand All @@ -42,7 +38,7 @@ jobs:
- name: Install click to the default EDM environment
run: edm install -y wheel click coverage
- name: Install test environment
run: edm run -- python etstool.py install --toolkit=${{ matrix.toolkit }} --source
run: edm run -- python etstool.py install --toolkit=${{ matrix.toolkit }} --runtime=${{ matrix.runtime }} --source
- name: Run tests (Linux)
if: matrix.os == 'ubuntu-latest'
run: xvfb-run -a edm run -- python etstool.py test --toolkit=${{ matrix.toolkit }}
Expand Down