You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@datasketches.apache.org by jm...@apache.org on 2023/01/19 23:15:53 UTC

[datasketches-cpp] branch linux-arm64-wheels updated: can't use pypa/cibuildwheel so revert but try to use more evn variables

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

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


The following commit(s) were added to refs/heads/linux-arm64-wheels by this push:
     new 17a432f  can't use pypa/cibuildwheel so revert but try to use more evn variables
17a432f is described below

commit 17a432f5f2f52167197061b2f0ad029e0a32eecc
Author: Jon Malkin <78...@users.noreply.github.com>
AuthorDate: Thu Jan 19 15:15:44 2023 -0800

    can't use pypa/cibuildwheel so revert but try to use more evn variables
---
 .github/workflows/build_wheels.yml | 30 ++++++++++++------------------
 1 file changed, 12 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/build_wheels.yml b/.github/workflows/build_wheels.yml
index 16c6ee5..264fd74 100644
--- a/.github/workflows/build_wheels.yml
+++ b/.github/workflows/build_wheels.yml
@@ -86,32 +86,26 @@ jobs:
         with:
           platforms: arm64
 
-      #- name: Install Python dependencies
-      #  run: python -m pip install cibuildwheel==2.12.0
+      - name: Install Python dependencies
+        run: python -m pip install cibuildwheel==2.12.0
         
-      #- name: Configure cibuildwheel
-      #  shell: bash
-      #  run: |
-      #    CMAKE_OSX_ARCHITECTURES=${{ matrix.config.cibw-arch == 'macosx_x86_64' && 'x86_64' || matrix.config.cibw-arch == 'macosx_arm64' && 'arm64' || matrix.config.cibw-arch == 'macosx_universal2' && '"arm64;x86_64"' || '' }}
-      #    echo "CIBW_ARCHS_MACOS=x86_64 arm64" >> $GITHUB_ENV
-      #    echo "CIBW_BUILD=*-${{ matrix.config.cibw-arch }}" >> $GITHUB_ENV
-      #    echo "CIBW_ENVIRONMENT_MACOS=CMAKE_OSX_ARCHITECTURES=\"$CMAKE_OSX_ARCHITECTURES\"" >> $GITHUB_ENV
+      - name: Configure cibuildwheel
+        shell: bash
+        #echo "CIBW_ARCHS_MACOS=x86_64 arm64" >> $GITHUB_ENV
+        #echo "CIBW_BUILD=*-${{ matrix.config.cibw-arch }}" >> $GITHUB_ENV
+        #CMAKE_OSX_ARCHITECTURES=${{ matrix.config.cibw-arch == 'macosx_x86_64' && 'x86_64' || matrix.config.cibw-arch == 'macosx_arm64' && 'arm64' || matrix.config.cibw-arch == 'macosx_universal2' && '"arm64;x86_64"' || '' }}
+        run: |
+          CMAKE_OSX_ARCHITECTURES=${{ matrix.config.cibw-arch == 'macosx_x86_64' && 'x86_64' || matrix.config.cibw-arch == 'macosx_arm64' && 'arm64' || '' }}
+          echo "CIBW_ENVIRONMENT_MACOS=CMAKE_OSX_ARCHITECTURES=\"$CMAKE_OSX_ARCHITECTURES\"" >> $GITHUB_ENV
         
-      #- name: Build wheels
-      #  run: python -m cibuildwheel --output-dir dist
-      #  env:
-      #    CIBW_BEFORE_BUILD_LINUX: "yum remove -y cmake"
-      #    CIBW_BEFORE_BUILD: "python -m pip install cmake>=3.18"
-      #    CIBW_SKIP: "*-win32 pp*-macosx*"
-
       - name: Build wheels
-        uses: pypa/cibuildwheel@v2.12.0
+        run: python -m cibuildwheel --output-dir dist
         env:
           CIBW_ARCHS_MACOS: "x86_64 arm64"
           CIBW_BUILD: "*-${{ matrix.config.cibw-arch }}"
-          CIBW_SKIP: "*-win32 pp*-macosx*"
           CIBW_BEFORE_BUILD_LINUX: "yum remove -y cmake"
           CIBW_BEFORE_BUILD: "python -m pip install cmake>=3.18"
+          CIBW_SKIP: "*-win32 pp*-macosx*"
           
       - uses: actions/upload-artifact@v3
         with:


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datasketches.apache.org
For additional commands, e-mail: commits-help@datasketches.apache.org