This is an automated email from the ASF dual-hosted git repository.

jmalkin pushed a commit to branch update_build_wheels
in repository https://gitbox.apache.org/repos/asf/datasketches-cpp.git


The following commit(s) were added to refs/heads/update_build_wheels by this 
push:
     new b924e9a  set cmake osx build architecture
b924e9a is described below

commit b924e9a5962e9cca4673471020cea9c4210460fe
Author: Jon Malkin <[email protected]>
AuthorDate: Fri Sep 23 01:33:42 2022 -0700

    set cmake osx build architecture
---
 .github/workflows/build_wheels.yml | 41 ++++++++++++++++++++++++++++----------
 1 file changed, 31 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/build_wheels.yml 
b/.github/workflows/build_wheels.yml
index dd7778c..7e0c8d0 100644
--- a/.github/workflows/build_wheels.yml
+++ b/.github/workflows/build_wheels.yml
@@ -37,22 +37,36 @@ jobs:
     name: ${{ matrix.config.name }}
     runs-on: ${{ matrix.config.os }}
     strategy:
-      fail-fast: false
+      #fail-fast: false
       matrix:
         config:
         - {
-            name: "MacOS 10.15",
-            os: macos-latest
+            name: "MacOS Latest (Intel)",
+            os: macos-latest,
+            cibw-arch: macosx_x86_64
           }
         - {
-            name: "Ubuntu Latest",
-            os: ubuntu-latest
+            name: "MacOS Latest (Apple Silicon)",
+            os: macos-latest,
+            cibw-arch: macosx_arm64
+          }
+        - {
+            name: "Ubuntu Latest (x86_64)",
+            os: ubuntu-latest,
+            cibw-arch: manylinux_x86_64
+          }
+        - {
+            name: "Ubuntu Latest (i686)",
+            os: ubuntu-latest,
+            cibw-arch: manylinux_i686
           }
         - {
             name: "Windows Latest",
-            os: windows-latest
+            os: windows-latest,
+            cibw-arch: win_amd64
           }
-            
+
+
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -63,15 +77,22 @@ jobs:
           python-version: '3.x'
            
       - name: Install Python dependencies
-        run: python -m pip install cibuildwheel==2.9.0
+        run: python -m pip install cibuildwheel==2.5.0
+        
+      - name: Configure cibuildwheel
+        shell: bash
+        run: |
+          CMAKE_OSX_ARCHITECTURES=${{ matrix.cibw-arch == 'macosx_x86_64' && 
'x86_64' || matrix.cibw-arch == 'macosx_arm64' && 'arm64' || matrix.cibw-arch 
== 'macosx_universal2' && '"arm64;x86_64"' || '' }}
+          echo "CIBW_ARCHS_MACOS=x86_64 arm64" >> $GITHUB_ENV
+          echo "CIBW_BUILD=*-${{ matrix.cibw-arch }}" >> $GITHUB_ENV
+          echo 
"CIBW_ENVIRONMENT_MACOS=CMAKE_OSX_ARCHITECTURES=\"$CMAKE_OSX_ARCHITECTURES\"" 
>> $GITHUB_ENV
         
       - name: Build wheels
         run: python -m cibuildwheel --output-dir dist
         env:
-          MACOSX_DEPLOYMENT_TARGET: 10.15
+          CIBW_BEFORE_BUILD_LINUX: "yum remove -y cmake"
           CIBW_BEFORE_BUILD: python -m pip install cmake>=3.18
           CIBW_SKIP: "*-win32 pp*-macosx*"
-          CIBW_ARCHS_MACOS: "x86_64 arm64"
 
       - uses: actions/upload-artifact@v2
         with:


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to