[CI] use Ninja on Windows (supports sccache)

kul-optec · Dec 4, 2024 · 4962ce4 · 4962ce4
1 parent 9e4e29e
commit 4962ce4
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 10 deletions.
diff --git a/.github/workflows/wheel.yml b/.github/workflows/wheel.yml
@@ -217,19 +217,42 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [macos-latest, windows-latest]
+        include:
+        - os: windows-latest
+          cibw-arch: AMD64
+          arch: amd64
+        - os: windows-latest
+          cibw-arch: x86
+          arch: amd64_x86
+        - os: windows-latest
+          cibw-arch: ARM64
+          arch: amd64_arm64
+        - os: macos-latest
+          cibw-arch: universal2
       fail-fast: false
     env:
       CONAN_HOME: ${{ github.workspace }}/.conan2
       SCCACHE_GHA_VERSION: "1"
       SCCACHE_CACHE_MULTIARCH: "1"
+      CIBW_ARCHS: ${{ matrix.cibw-arch }}
+      CIBW_ENABLE: 'pypy'
+      CIBW_TEST_SKIP: 'pp*'
+      CIBW_BUILD: 'cp311-* pp310-*'
     steps:
       - name: Checkout
         uses: actions/checkout@v4
 
+      - name: Install Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.12"
+
       - name: Install sccache
         uses: mozilla-actions/sccache-action@9e326ebed976843c9932b3aa0e021c6f50310eb4
 
+      - name: Install cibuildwheel
+        run: python -m pip install cibuildwheel~=2.22.0
+
       - name: Cache Conan dependencies
         uses: actions/cache@v4
         with:
@@ -250,19 +273,20 @@ jobs:
           cp -a scripts sdist
 
       - name: Build wheels
-        uses: pypa/cibuildwheel@ee63bf16da6cddfb925f542f2c7b59ad50e93969
-        with:
-          package-dir: sdist
-          output-dir: dist
-        env:
-          CIBW_ENABLE: 'pypy'
-          CIBW_TEST_SKIP: 'pp*'
-          CIBW_BUILD: 'cp311-* pp310-*'
+        if: runner.os == 'Windows'
+        shell: cmd
+        run: |
+          call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" ${{ matrix.arch }}
+          cibuildwheel sdist --output-dir dist
+
+      - name: Build wheels
+        if: runner.os != 'Windows'
+        run: cibuildwheel sdist --output-dir dist
 
       - name: Upload package
         uses: actions/upload-artifact@v4
         with:
-          name: wheels-${{ matrix.os }}
+          name: wheels-${{ matrix.os }}-${{ matrix.cibw-arch }}
           path: ./dist/*.whl
 
   # This step checks the package version before release (to make sure that the

diff --git a/scripts/ci/pre-build-windows.py b/scripts/ci/pre-build-windows.py
@@ -54,6 +54,7 @@
 arch={conan_arch}
 build_type=Release
 [conf]
+tools.cmake.cmaketoolchain:generator=Ninja Multi-Config
 tools.build:skip_test=True
 tools.build:cflags+={cpu_flags}
 tools.build:cxxflags+={cpu_flags}

diff --git a/scripts/ci/py-build-cmake.toml b/scripts/ci/py-build-cmake.toml
@@ -1,3 +1,6 @@
+[cmake]
+generator = "Ninja Multi-Config"
+
 [cmake.options]
 "CMAKE_BUILD_TYPE" = "Debug" # Forces pybind11 to keep debug symbols (https://github.com/pybind/pybind11/issues/4454)