CI: Use macos-15-intel runners for x86 builds #3770
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Member
|
Changes look ok but builds are failing? |
Member
Author
|
Yeah its conan being annoying, conan v1 by default doesn't recognize apple-clang 17.0 (needs to be patched in our CI) |
MridulS
commented
Oct 9, 2025
Comment on lines
+5
to
+23
| def patch_conan() -> bool: | ||
| for site_dir in site.getsitepackages(): | ||
| conf_file = Path(site_dir) / "conans/client/conf/__init__.py" | ||
| if conf_file.exists(): | ||
| break | ||
| else: | ||
| print("No Conan config file found, skipping") | ||
| return False | ||
| content = conf_file.read_text() | ||
| old_version_string = """apple-clang: &apple_clang | ||
| version: ["5.0", "5.1", "6.0", "6.1", "7.0", "7.3", "8.0", "8.1", "9.0", "9.1", | ||
| "10.0", "11.0", "12.0", "13", "13.0", "13.1", "14", "14.0", "15", "15.0", "16", "16.0"]""" # noqa: E501 | ||
| new_version_string = """apple-clang: &apple_clang | ||
| version: ["15", "15.0", "16", "16.0","17", "17.0"]""" | ||
| content = content.replace(old_version_string, new_version_string) | ||
| conf_file.write_text(content) | ||
| print(f"Patched Conan config file {conf_file}") | ||
| return True | ||
|
|
Member
Author
There was a problem hiding this comment.
Absolutely terrible and fragile, but it works.
MridulS
commented
Oct 9, 2025
Comment on lines
+331
to
+337
| slicer<T>::template set<std::tuple<Dim, scipp::index>>( | ||
| self, to_dim_type(std::move(index)), data); | ||
| }); | ||
| c.def("__setitem__", [](T &self, std::tuple<std::string, py::slice> index, | ||
| const py::object &data) { | ||
| slicer<T>::template set(self, to_dim_type(std::move(index)), data); | ||
| slicer<T>::template set<std::tuple<Dim, py::slice>>( | ||
| self, to_dim_type(std::move(index)), data); |
Member
Author
There was a problem hiding this comment.
The compiler in macos-15-intel was complaining about this.
MridulS
commented
Oct 9, 2025
| commands: | ||
| - python -m pytest -v tests | ||
| - python cmake-package-test/build.py | ||
| - python cmake-package-test/build.py # [linux] |
Member
Author
There was a problem hiding this comment.
Turn off cmake-package-test for macos and windows as it takes too long to build scipp twice in the CI.
Member
Author
|
All weekly builds passed https://github.com/scipp/scipp/actions/runs/18369820377 |
SimonHeybrock
approved these changes
Oct 9, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
fixes #3755