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

Fixes for Mac M1 issues on Github Actions #1563

Merged
merged 4 commits into from
May 1, 2024
Merged

Fixes for Mac M1 issues on Github Actions #1563

merged 4 commits into from
May 1, 2024

Conversation

emlys
Copy link
Member

@emlys emlys commented Apr 26, 2024 •
edited
Loading

Description

Fixes #1562
This PR fixes 3 issues that resulted from the macos-latest runner moving from macos-13 (Intel) to macos-14 (M1).

  • Updates the node_modules cache key to include the runner architecture. This triggered the cache to refresh so we're not using the old x86 packages.
  • Add a pytest exception for a specific warning
  • Update an NDR test to avoid an edge case

Checklist

  • Updated HISTORY.rst and link to any relevant issue (if these changes are user-facing)
  • Updated the user's guide (if needed)
  • Tested the Workbench UI (if relevant)

@emlys
modify invalid test geometry for ndr
8309411 
The old geometry had its self intersection on the pixel centerpoint,
which should work, but didn't on M1 mac runners (see natcap#1562).
This modifies the geometry so that the pixel centerpoint is fully
within the geometry, which I'm hoping is more stable.
@emlys emlys changed the title upload conda env artifact whether fails or succeeds Fixes for Mac M1 issues on Github Actions May 1, 2024
@emlys emlys self-assigned this May 1, 2024
@emlys emlys requested a review from phargogh May 1, 2024 22:36
@emlys emlys marked this pull request as ready for review May 1, 2024 22:36
phargogh
phargogh approved these changes May 1, 2024
View reviewed changes
Copy link
Member

@phargogh phargogh left a comment

Choose a reason for hiding this comment

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

Fun! Thanks for diving into these failures.

@phargogh phargogh merged commit f686b84 into natcap:main May 1, 2024
29 checks passed
@emlys emlys deleted the bugfix/1562 branch October 3, 2024 22:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@phargogh phargogh phargogh approved these changes

Assignees

@emlys emlys

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Tests failing on main
2 participants
@emlys @phargogh