Skip to content

Commit 51f4fe0

Browse files
ci: fix macos builds [backport 2.2] (#7968)
Backport 66e6c3c from #7961 to 2.2. CI: Fix MacOS builds - Pin MacOS runner to 12 instead of latest - Pin cmake as 3.28 hangs ## Checklist - [x] Change(s) are motivated and described in the PR description. - [x] Testing strategy is described if automated tests are not included in the PR. - [x] Risk is outlined (performance impact, potential for breakage, maintainability, etc). - [x] Change is maintainable (easy to change, telemetry, documentation). - [x] [Library release note guidelines](https://ddtrace.readthedocs.io/en/stable/releasenotes.html) are followed. If no release note is required, add label `changelog/no-changelog`. - [x] Documentation is included (in-code, generated user docs, [public corp docs](https://github.com/DataDog/documentation/)). - [x] Backport labels are set (if [applicable](https://ddtrace.readthedocs.io/en/latest/contributing.html#backporting)) ## Reviewer Checklist - [x] Title is accurate. - [x] No unnecessary changes are introduced. - [x] Description motivates each change. - [x] Avoids breaking [API](https://ddtrace.readthedocs.io/en/stable/versioning.html#interfaces) changes unless absolutely necessary. - [x] Testing strategy adequately addresses listed risk(s). - [x] Change is maintainable (easy to change, telemetry, documentation). - [x] Release note makes sense to a user of the library. - [x] Reviewer has explicitly acknowledged and discussed the performance implications of this PR as reported in the benchmarks PR comment. - [x] Backport labels are set in a manner that is consistent with the [release branch maintenance policy](https://ddtrace.readthedocs.io/en/latest/contributing.html#backporting) - [x] If this PR touches code that signs or publishes builds or packages, or handles credentials of any kind, I've requested a review from `@DataDog/security-design-and-guidance`. - [x] This PR doesn't touch any of that. Co-authored-by: Federico Mon <[email protected]>
1 parent ad531b5 commit 51f4fe0

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

.github/workflows/build_python_3.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
archs: aarch64
2626
- os: windows-latest
2727
archs: AMD64 x86
28-
- os: macos-latest
28+
- os: macos-12
2929
archs: x86_64 universal2
3030
steps:
3131
- uses: actions/checkout@v3
@@ -70,7 +70,8 @@ jobs:
7070
choco install -y 7zip &&
7171
7z d -r "{wheel}" *.c *.cpp *.cc *.h *.hpp *.pyx &&
7272
move "{wheel}" "{dest_dir}"
73-
73+
# DEV: Uncomment to debug MacOS
74+
# CIBW_BUILD_VERBOSITY_MACOS: 3
7475
- uses: actions/upload-artifact@v3
7576
with:
7677
path: ./wheelhouse/*.whl

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[build-system]
2-
requires = ["setuptools_scm[toml]>=4", "cython", "cmake>=3.24.2; python_version>='3.7'"]
2+
requires = ["setuptools_scm[toml]>=4", "cython", "cmake>=3.24.2,<3.28; python_version>='3.7'"]
33
build-backend = "setuptools.build_meta"
44

55
[project]

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -627,7 +627,7 @@ def get_ddup_ext():
627627
"Programming Language :: Python :: 3.11",
628628
"Programming Language :: Python :: 3.12",
629629
],
630-
setup_requires=["setuptools_scm[toml]>=4", "cython", "cmake>=3.24.2"],
630+
setup_requires=["setuptools_scm[toml]>=4", "cython", "cmake>=3.24.2,<3.28"],
631631
ext_modules=ext_modules
632632
+ cythonize(
633633
[

0 commit comments

Comments
 (0)