Skip to content

Commit

Permalink
change SDKROOT 2
Browse files Browse the repository at this point in the history
  • Loading branch information
ameli committed Jan 21, 2024
1 parent d52421a commit ff56983
Show file tree
Hide file tree
Showing 10 changed files with 45 additions and 28 deletions.
4 changes: 2 additions & 2 deletions .cirrus.star
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ load("cirrus", "env", "fs", "http")
def main(ctx):

file = ''
file += fs.read("tools/ci/cirrus_deploy_pypi_linux_aarch64.yml")
# file += fs.read("tools/ci/cirrus_deploy_pypi_linux_aarch64.yml")
file += fs.read("tools/ci/cirrus_deploy_pypi_macosx_arm64.yml")
file += fs.read("tools/ci/cirrus_deploy_conda_linux_aarch64.yml")
# file += fs.read("tools/ci/cirrus_deploy_conda_linux_aarch64.yml")
file += fs.read("tools/ci/cirrus_deploy_conda_macosx_arm64.yml")

return file
6 changes: 3 additions & 3 deletions .github/workflows/build-linux.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
name: build-linux

on:
push:
branches:
- main
# push:
# branches:
# - main
release:
types:
- published
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/build-macos.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
name: build-macos

on:
push:
branches:
- main
# push:
# branches:
# - main
release:
types:
- published
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/build-windows.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
name: build-windows

on:
push:
branches:
- main
# push:
# branches:
# - main
release:
types:
- published
Expand Down
8 changes: 3 additions & 5 deletions .github/workflows/check-manifest.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
name: "Check Manifest"

on:
push:
branches:
- main
# push: # NOTE: meson-build has issues with building sdist, which is needed for check-manifest. Disable for now.
# branches:
# - main
release:
types: [published]

Expand All @@ -25,8 +25,6 @@ jobs:
- name: Install package
run: |
python -m pip install --upgrade pip
python -m pip install cython
python -m pip install --upgrade numpy
python -m pip install . -vvv
- name: Install test dependencies
Expand Down
27 changes: 23 additions & 4 deletions .github/workflows/deploy-conda.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,19 +31,38 @@ jobs:
if: matrix.os != 'windows-latest'
run: rm -rf /opt/hostedtoolcache

# Build wheel for windows X86_64 and ARM64
- name: Build wheels in windows (X86_64, ARM64) Python ${{ matrix.python-version }}
# Build wheel for windows X86_64
- name: Build wheels in windows (X86_64) Python ${{ matrix.python-version }}
if: matrix.os == 'windows-latest'
uses: pypa/[email protected]
env:
CIBW_ARCHS_WINDOWS: "AMD64 x86 ARM64"
CIBW_BUILD: "${{ matrix.python-version }}-win_amd64 ${{ matrix.python-version }}-win_arm64"
CIBW_ARCHS_WINDOWS: "AMD64 x86"
CIBW_BUILD: "${{ matrix.python-version }}-win_amd64"
CIBW_SKIP: "pp* cp36-* cp37-* cp38-*"
CIBW_BUILD_VERBOSITY: 3
CIBW_BEFORE_BUILD_WINDOWS: "pip install delvewheel"
CIBW_REPAIR_WHEEL_COMMAND_WINDOWS: "delvewheel repair -w {dest_dir} {wheel}"
with:
output-dir: wheelhouse

# Build wheel for windows ARM64 (DO NOT USE)
# Note: DO NOT build ARM64 for windows. The reason is that this github runner is an X86_64
# machine. To build ARM64 wheels, cibuildwheels uses "cross compiling". This is supported
# possible when the build tool is "setuptools". But currently, it is not supported using meson.build.
# Since, this package uses meson.build, as such, cross compiling for ARM64 is not possible.
# To read more, see: https://cibuildwheel.readthedocs.io/en/stable/faq/#windows-arm64
# - name: Build wheels in windows (ARM64) Python ${{ matrix.python-version }}
# if: matrix.os == 'windows-latest'
# uses: pypa/[email protected]
# env:
# CIBW_ARCHS_WINDOWS: "ARM64"
# CIBW_BUILD: "${{ matrix.python-version }}-win_arm64"
# CIBW_SKIP: "pp37-* cp36-* cp37-* cp38-*"
# CIBW_BUILD_VERBOSITY: 3
# CIBW_BEFORE_BUILD_WINDOWS: "pip install delvewheel"
# CIBW_REPAIR_WHEEL_COMMAND_WINDOWS: "delvewheel repair -w {dest_dir} {wheel}"
# with:
# output-dir: wheelhouse

# Build wheel for macos X86_64.
# Note that wheels for macos ARM64 will be built on cirrus ci (see /tools/ci)
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/deploy-docs.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
name: docs

on:
push:
branches:
- main
# push:
# branches:
# - main
pull_request:
branches:
- main
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/deploy-pypi.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
name: deploy-pypi

on:
push:
branches:
- main
# push:
# branches:
# - main
release:
types:
- published
Expand Down
2 changes: 1 addition & 1 deletion tools/ci/cirrus_deploy_conda_macosx_arm64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ conda_build_wheels_macosx_arm64_task:
# MACOS linker doesn't support stripping symbols, hence we set: CFLAGS="-fno-strict-aliasing"
CIBW_ENVIRONMENT_MACOS: >
RUNNER_OS=macOS
SDKROOT=/Applications/Xcode-15.1.0.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX14.2.sdk
LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH
CFLAGS="-fno-strict-aliasing"
CIBW_ARCHS: "arm64"
Expand All @@ -65,7 +66,6 @@ conda_build_wheels_macosx_arm64_task:
- which python
- python -c "import platform;print(platform.python_version());print(platform.system());print(platform.machine())"
- clang --version
- export SDKROOT=$(xcrun --sdk macosx --show-sdk-path)
<<: *CONDA_MACOSX_ARM64_CIBW


Expand Down
2 changes: 1 addition & 1 deletion tools/ci/cirrus_deploy_pypi_macosx_arm64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ pypi_build_wheels_macosx_arm64_task:
# MACOS linker doesn't support stripping symbols, hence we set: CFLAGS="-fno-strict-aliasing"
CIBW_ENVIRONMENT_MACOS: >
RUNNER_OS=macOS
SDKROOT=/Applications/Xcode-15.1.0.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX14.2.sdk
LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH
CFLAGS="-fno-strict-aliasing"
CIBW_ARCHS: "arm64"
Expand All @@ -71,7 +72,6 @@ pypi_build_wheels_macosx_arm64_task:
- which python
- python -c "import platform;print(platform.python_version());print(platform.system());print(platform.machine())"
- clang --version
- export SDKROOT=$(xcrun --sdk macosx --show-sdk-path)
<<: *PYPI_MACOSX_ARM64_CIBW


Expand Down

0 comments on commit ff56983

Please sign in to comment.