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

ci: update to latest intel osx runner and download 10.15 SDK #5387

Merged
merged 33 commits into from
Jun 27, 2024

Conversation

beckermr
Copy link
Contributor

@beckermr beckermr commented Jun 24, 2024

Description

This PR updates the CI to the latest intel osx runner and to download the 10.15 SDK.

I have preserved the older option of directly using the system SDK via xcode. This should make it easier for folks to work locally in some cases without doing their own SDK download.

Resolves #5378

Checklist - did you ...

  • Add a file to the news directory (using the template) for the next release's release notes?
  • Add / update necessary tests?
  • Add / update outdated documentation?

@conda-bot conda-bot added the cla-signed [bot] added once the contributor has signed the CLA label Jun 24, 2024
@beckermr beckermr changed the title ci: update to latest osx SDK ci: update to latest osx SDK and ignore tarfile warnings Jun 24, 2024
Copy link

codspeed-hq bot commented Jun 24, 2024

CodSpeed Performance Report

Merging #5387 will not alter performance

Comparing beckermr:mac12 (cbe5d3a) with main (c7a1e9b)

Summary

✅ 3 untouched benchmarks

.github/workflows/tests.yml Outdated Show resolved Hide resolved
@kenodegard
Copy link
Contributor

I also started on this in #5379

While the SDK downloads are working I haven't quite gotten the tests to pass again

.github/workflows/tests.yml Outdated Show resolved Hide resolved
.github/workflows/tests.yml Outdated Show resolved Hide resolved
.github/workflows/tests.yml Outdated Show resolved Hide resolved
news/5387-ci-osx-sdk Outdated Show resolved Hide resolved
tests/test_api_skeleton.py Outdated Show resolved Hide resolved
tests/test_api_skeleton.py Outdated Show resolved Hide resolved
tests/test_api_skeleton.py Outdated Show resolved Hide resolved
.github/workflows/tests.yml Outdated Show resolved Hide resolved
tests/conftest.py Outdated Show resolved Hide resolved
tests/conftest.py Outdated Show resolved Hide resolved
.github/workflows/tests.yml Outdated Show resolved Hide resolved
tests/conftest.py Outdated Show resolved Hide resolved
@beckermr beckermr changed the title ci: update to latest osx SDK and ignore tarfile warnings ci: update to latest intel osx runner and download 10.15 SDK Jun 26, 2024
@beckermr beckermr marked this pull request as ready for review June 26, 2024 13:44
@beckermr beckermr requested a review from a team as a code owner June 26, 2024 13:44
@beckermr
Copy link
Contributor Author

OK @kenodegard this one is ready for review!

This PR has the most minimal changes I could make to get the test suite to pass on the macos-13 runners.

Some notes and comments:

  • Your approach in Create fixture to fetch MacOSX SDKs #5379 for the SDKs is more complete for sure. However, it does couple code in the test suite (the fixture) with the locally cached directory on the runners (~/macosx_sdks).
  • I have opted here to keep all of the SDK handling in GHA and have the test suite use w/e sysroot the user presents to it, either through xcode or the CONDA_BUILD_SYSROOT environment variable.
  • The approach here may help folks who use the test suite locally in that they can easily use w/e sysroot they like for testing by setting the CONDA_BUILD_SYSROOT.
  • Intel mac hardware is going away and there are lots of tests that have to be run on osx-64 due to packages not be available on osx-arm64. I documented part of this in issue tests use packages not on osx-arm64 #5388. We have time to address this one too.

@beckermr beckermr requested a review from kenodegard June 26, 2024 13:53
@beckermr
Copy link
Contributor Author

@conda/builds-tools @kenodegard The CI here will break starting TOMORROW if we do not merge something to remove macos-11. Shall we merge this one?

@kenodegard
Copy link
Contributor

@beckermr thanks for working on this!

@beckermr beckermr merged commit c49182f into conda:main Jun 27, 2024
28 checks passed
@beeankha beeankha mentioned this pull request Jul 16, 2024
55 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cla-signed [bot] added once the contributor has signed the CLA
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

Update workflows to discontinue macos-11 usage
3 participants