Skip to content

Commit 2c49268

Browse files
authored
ci: fix macos builds [backport 1.20] (#7972)
CI: Fix MacOS builds - Pin MacOS runner to 12 instead of latest - Pin cmake as 3.28 hangs ## Checklist 1 - [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)) ## Checklist 2 - [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. (cherry picked from commit 66e6c3c)
1 parent 8b40698 commit 2c49268

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
@@ -54,7 +54,8 @@ jobs:
5454
CIBW_SKIP: ${{ inputs.cibw_skip }}
5555
CIBW_PRERELEASE_PYTHONS: ${{ inputs.cibw_prerelease_pythons }}
5656
CMAKE_BUILD_PARALLEL_LEVEL: 12
57-
57+
# DEV: Uncomment to debug MacOS
58+
# CIBW_BUILD_VERBOSITY_MACOS: 3
5859
- uses: actions/upload-artifact@v3
5960
with:
6061
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,<8", "cython<3", "cmake>=3.24.2; python_version>='3.6'"]
2+
requires = ["setuptools_scm[toml]>=4,<8", "cython<3", "cmake>=3.24.2,<3.28; python_version>='3.6'"]
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
@@ -604,7 +604,7 @@ def get_ddup_ext():
604604
"Programming Language :: Python :: 3.10",
605605
"Programming Language :: Python :: 3.11",
606606
],
607-
setup_requires=["setuptools_scm[toml]>=4,<8", "cython<3", "cmake>=3.24.2; python_version>='3.6'"],
607+
setup_requires=["setuptools_scm[toml]>=4,<8", "cython<3", "cmake>=3.24.2,<3.28; python_version>='3.6'"],
608608
ext_modules=ext_modules
609609
+ cythonize(
610610
[

0 commit comments

Comments
 (0)