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

Update macOS runner #424

Merged
merged 5 commits into from
Dec 5, 2024
Merged

Update macOS runner #424

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3e185ac
update runner to macos13
MarcAntoineSchmidtQC Dec 5, 2024
10c2948
CONDA -> MAMBA_ROOT_PREFIX
MarcAntoineSchmidtQC Dec 5, 2024
326e126
update dollowing refs
MarcAntoineSchmidtQC Dec 5, 2024
d6f0471
test out native builds on macos
MarcAntoineSchmidtQC Dec 5, 2024
c66f340
simplify build
MarcAntoineSchmidtQC Dec 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions .github/workflows/build-wheels.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-20.04, windows-2019, macos-12]
os: [ubuntu-20.04, windows-2019, macos-13, macos-14]

steps:
- uses: actions/checkout@v4
Expand All @@ -28,15 +28,11 @@ jobs:
uses: pypa/[email protected]
env:
CIBW_ARCHS_LINUX: auto
CIBW_ARCHS_MACOS: x86_64 arm64
CIBW_TEST_SKIP: '*-macosx_arm64'
- name: Build wheels (release)
if: github.event_name == 'release' && github.event.action == 'published'
uses: pypa/[email protected]
env:
CIBW_ARCHS_LINUX: x86_64 aarch64
CIBW_ARCHS_MACOS: x86_64 arm64
CIBW_TEST_SKIP: '*-macosx_arm64'
- uses: actions/upload-artifact@v4
with:
name: cibw-wheels-${{ matrix.os }}-${{ strategy.job-index }}
Expand Down
11 changes: 0 additions & 11 deletions build_tools/prepare_macos_wheel.sh
View file
Open in desktop

This file was deleted.

8 changes: 4 additions & 4 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,13 +57,13 @@ test-command = "pytest {package}/tests/test_matrices.py"

[tool.cibuildwheel.macos]
before-build = [
"bash build_tools/prepare_macos_wheel.sh",
"/Users/runner/micromamba-bin/micromamba create -y -p $MAMBA_ROOT_PREFIX/envs/build -c conda-forge jemalloc-local \"xsimd<11|>12.1\" llvm-openmp",
]

[tool.cibuildwheel.macos.environment]
LDFLAGS="-Wl,-rpath,$CONDA/envs/build/lib -L$CONDA/envs/build/lib -headerpad_max_install_names"
CFLAGS="-I$CONDA/envs/build/include"
CXXFLAGS="-I$CONDA/envs/build/include"
LDFLAGS="-Wl,-rpath,$MAMBA_ROOT_PREFIX/envs/build/lib -L$MAMBA_ROOT_PREFIX/envs/build/lib -headerpad_max_install_names"
CFLAGS="-I$MAMBA_ROOT_PREFIX/envs/build/include"
CXXFLAGS="-I$MAMBA_ROOT_PREFIX/envs/build/include"
CXX="/usr/bin/clang++"
CC="/usr/bin/clang"
JE_INSTALL_SUFFIX="local"
Expand Down
Loading