Skip to content

Commit

Permalink
Merge branch 'topic/default/wheels-windows-clang-cl' into 'branch/def…
Browse files Browse the repository at this point in the history
…ault'

Topic/default/wheels windows clang cl

See merge request fluiddyn/fluidfft!62
  • Loading branch information
paugier committed Apr 3, 2024
2 parents 724db09 + c5ad60b commit cb7ecff
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 8 deletions.
35 changes: 28 additions & 7 deletions .github/workflows/wheels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,31 +13,51 @@ jobs:
include:
- os: ubuntu
architecture: x86_64
# really long (2 hours), see next job wheel-ubuntu-aarch64
# really long (2 hours), see job wheel-ubuntu-aarch64
# - os: ubuntu
# architecture: aarch64
- os: macos
architecture: x86_64
- os: macos
architecture: arm64
- os: windows
architecture: AMD64
steps:
- uses: actions/checkout@v4
- uses: docker/setup-qemu-action@v2
- uses: actions/setup-python@v5
with:
platforms: arm64
if: runner.os == 'Linux' && matrix.architecture == 'aarch64'
python-version: 3.x
- name: Build wheels
uses: pypa/[email protected]
env:
CIBW_SKIP: pp* cp36-* cp37-* cp38-* *-musllinux*
CIBW_ARCHS: ${{ matrix.architecture }}
- uses: actions/upload-artifact@v4
with:
name: wheel-${{ matrix.os }}-${{ matrix.architecture }}
path: wheelhouse/*.whl

wheels-windows:
runs-on: ${{ matrix.os }}-latest
strategy:
fail-fast: false
matrix:
include:
- os: windows
architecture: AMD64
steps:
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
with:
python-version: 3.x

- name: Build wheels
uses: pypa/[email protected]
env:
CIBW_SKIP: pp* cp36-* cp37-* cp38-* *-musllinux*
CIBW_ARCHS: ${{ matrix.architecture }}
# increase pip debugging output
# CIBW_BUILD_VERBOSITY: 2
# define CC, CXX so meson will use clang-cl instead of MSVC
CC: clang-cl
CXX: clang-cl
- uses: actions/upload-artifact@v4
with:
name: wheel-${{ matrix.os }}-${{ matrix.architecture }}
Expand Down Expand Up @@ -104,6 +124,7 @@ jobs:
startsWith(github.ref, 'refs/tags/')
needs:
- wheels
- wheels-windows
- wheel-ubuntu-aarch64
- sdist
- check-sdist
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ build-backend = 'mesonpy'

[project]
name = "fluidfft"
version = "0.4.0.post0"
version = "0.4.0.post1"
description = "Efficient and easy Fast Fourier Transform (FFT) for Python."
authors = [
{name = "Pierre Augier", email = "[email protected]"},
Expand Down

0 comments on commit cb7ecff

Please sign in to comment.