update platform LLVM paths for pip and wheel actions

virtualcell · Jun 3, 2024 · fa170e3 · fa170e3
1 parent f593bb4
commit fa170e3
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 5 deletions.
diff --git a/.github/workflows/pip.yml b/.github/workflows/pip.yml
@@ -38,6 +38,10 @@ jobs:
         cmake --version
         brew info boost
         brew info hdf5
+        
+        echo "CC=/usr/local/opt/llvm/bin/clang" >> $GITHUB_ENV
+        echo "CXX=/usr/local/opt/llvm/bin/clang++" >> $GITHUB_ENV
+
 
     - name: Install ARM MacOS dependencies
       if: matrix.platform == 'macos-14'
@@ -56,6 +60,10 @@ jobs:
         cmake --version
         brew info boost
         brew info hdf5
+        
+        echo "CC=/opt/homebrew/opt/llvm/bin/clang" >> $GITHUB_ENV
+        echo "CXX=/opt/homebrew/opt/llvm/bin/clang++" >> $GITHUB_ENV
+
 
     - name: Install Windows Dependencies
       if: matrix.platform == 'windows-latest'
@@ -75,6 +83,11 @@ jobs:
           mingw-w64-clang-x86_64-libzip
           mingw-w64-clang-x86_64-zlib
           mingw-w64-clang-x86_64-libaec
+    - if: matrix.os == 'windows-latest'
+      run: |
+        echo "CC=/c/Program Files/LLVM/bin/clang.exe" >> $GITHUB_ENV
+        echo "CXX=/c/Program Files/LLVM/bin/clang++.exe" >> $GITHUB_ENV
+
 
     - name: Install Linux Dependencies
       if: matrix.platform == 'ubuntu-latest'
@@ -94,15 +107,27 @@ jobs:
       with:
         python-version: "${{ matrix.python-version }}"
 
-    - name: Build and install
+    - name: Build and install macos-13
+      run: pip install --verbose .
+      if: matrix.platform == 'macos-13'
+      env:
+        PATH: "/usr/local/opt/llvm/bin:${{ env.PATH }}"
+
+    - name: Build and install macos-14
+      run: pip install --verbose .
+      if: matrix.platform == 'macos-14'
+      env:
+        PATH: "/opt/homebrew/opt/llvm/bin:${{ env.PATH }}"
+
+    - name: Build and install windows-latest
       run: pip install --verbose .
       if: matrix.platform == 'windows-latest'
       env:
         PATH: "/c/Program Files/LLVM/bin:${{ env.PATH }}"
 
-    - name: Build and install
+    - name: Build and install ubuntu-latest
       run: pip install --verbose .
-      if: matrix.platform != 'windows-latest'
+      if: matrix.platform == 'ubuntu-latest'
 
     - name: Test
       run: |

diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
@@ -69,6 +69,10 @@ jobs:
         cmake --version
         brew info boost
         brew info hdf5
+        
+        echo "CC=/usr/local/opt/llvm/bin/clang" >> $GITHUB_ENV
+        echo "CXX=/usr/local/opt/llvm/bin/clang++" >> $GITHUB_ENV
+
 
     - name: Install ARM MacOS dependencies
       if: matrix.os == 'macos-14'
@@ -87,6 +91,9 @@ jobs:
         cmake --version
         brew info boost
         brew info hdf5
+        
+        echo "CC=/opt/homebrew/opt/llvm/bin/clang" >> $GITHUB_ENV
+        echo "CXX=/opt/homebrew/opt/llvm/bin/clang++" >> $GITHUB_ENV
 
     - name: Install Windows Dependencies
       if: matrix.os == 'windows-latest'
@@ -106,6 +113,11 @@ jobs:
           mingw-w64-clang-x86_64-libzip
           mingw-w64-clang-x86_64-zlib
           mingw-w64-clang-x86_64-libaec
+    - if: matrix.os == 'windows-latest'
+      run: |
+          echo "CC=/c/Program Files/LLVM/bin/clang.exe" >> $GITHUB_ENV
+          echo "CXX=/c/Program Files/LLVM/bin/clang++.exe" >> $GITHUB_ENV
+
 
     - name: Install Linux Dependencies
       if: matrix.os == 'ubuntu-latest'
@@ -124,8 +136,9 @@ jobs:
     - name: build wheel
       uses: pypa/[email protected]
       env:
-        CIBW_ARCHS_MACOS: universal2
-        CIBW_ARCHS_WINDOWS: auto ARM64
+        CIBW_ARCHS_MACOS: auto
+        CIBW_ARCHS_WINDOWS: auto
+        CIBW_ARCHS_LINUX: auto
 
     - name: Verify clean directory
       run: git diff --exit-code