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.

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

Fix architectures in PyPI workflow #1795

Merged
merged 8 commits into from
May 9, 2024
Merged

Fix architectures in PyPI workflow #1795

merged 8 commits into from
May 9, 2024

Conversation

mdickinson
Copy link
Member

@mdickinson mdickinson commented May 8, 2024

This PR attempts to fix the architectures in the test-from-pypi.yml workflow. The intent is to run tests on the following combinations:

  • windows-latest: x86 and x64
  • ubuntu-latest: x64
  • macos-latest: arm64
  • macos-13: x64

We also:

  • clean up the workflow to remove PySide6-related pieces that are no longer necessary
  • add defusedxml as a test dependency

Test run: https://github.com/enthought/traits/actions/runs/8998474167

@mdickinson mdickinson marked this pull request as draft May 8, 2024 07:44
@mdickinson mdickinson marked this pull request as ready for review May 8, 2024 08:13
@mdickinson
Copy link
Member Author

@flongford I think this is the final piece to get Traits CI back into a fully working state.

@mdickinson mdickinson requested a review from flongford May 8, 2024 08:13
Comment on lines 14 to 15
os: [ubuntu-latest, windows-latest, macos-latest, macos-13]
python-architecture: [x86, x64, arm64]
Copy link

@flongford flongford May 8, 2024

Choose a reason for hiding this comment

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

Potentially this multi-dimensional matrix might work / look a bit cleaner:

Suggested change
os: [ubuntu-latest, windows-latest, macos-latest, macos-13]
python-architecture: [x86, x64, arm64]
system:
- os: ubuntu-latest
architecture: x86
- os: windows-latest
architecture: x86
- os: windows-latest
architecture: x64
- os: macos-13
architecture: x86

Then use system.os and system.architecture variables accordingly.

I don't trust GH syntaxt to unpack arrays beyond the first nested set, so I explicitly declared the windows-latest architecture options

Copy link
Member Author

Choose a reason for hiding this comment

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

Thank you - adopted exactly this solution after some internal discussion (and before seeing this comment - sorry).

Copy link

@flongford flongford left a comment

Choose a reason for hiding this comment

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

LGTM!

@mdickinson mdickinson merged commit 49b886f into main May 9, 2024
79 checks passed
@mdickinson mdickinson deleted the fix/pypi-workflow branch May 9, 2024 06:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants